From 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Wed, 3 Nov 2021 14:40:53 -0700 Subject: Update to internal 0.77 Signed-off-by: Jason M. Bills --- .../recipes-core/base-files/base-files/40-oom_reboot.conf | 4 ++++ .../recipes-core/base-files/base-files_%.bbappend | 15 ++++++++++++++- .../recipes-core/ipmi/intel-ipmi-oem_%.bbappend | 2 +- .../recipes-core/logger-systemd/logger-systemd.inc | 1 - .../meta-common/recipes-core/os-release/version-vars.inc | 6 +++--- 5 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/40-oom_reboot.conf (limited to 'meta-openbmc-mods/meta-common/recipes-core') diff --git a/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/40-oom_reboot.conf b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/40-oom_reboot.conf new file mode 100644 index 000000000..43967a28b --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files/40-oom_reboot.conf @@ -0,0 +1,4 @@ +# panic kernel on OOM +vm.panic_on_oom=2 +# reboot after 10 sec on panic +kernel.panic=10 diff --git a/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files_%.bbappend index 799db92f3..ba5e41360 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/base-files/base-files_%.bbappend @@ -1,2 +1,15 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append = " file://fstab" +SRC_URI:append = " \ + file://fstab \ + file://40-oom_reboot.conf \ + " + +add_oom_reboot_config() { + install -d ${D}/${libdir}/sysctl.d + install -D -m 644 ${WORKDIR}/40-oom_reboot.conf ${D}/${libdir}/sysctl.d/40-oom_reboot.conf +} + +do_install:append() { + ${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'debug-tweaks', '', 'add_oom_reboot_config', d)} +} + diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index 9b5a06fc6..4811778ca 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -2,7 +2,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PF EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" EXTRA_OECMAKE += "-DUSING_ENTITY_MANAGER_DECORATORS=OFF" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "98cb6186e77fb820dd26666118964897d36730be" +SRCREV = "e83c70aab0479a8103638166b330a06e499f4449" FILESEXTRAPATHS:append := ":${THISDIR}/${PN}" diff --git a/meta-openbmc-mods/meta-common/recipes-core/logger-systemd/logger-systemd.inc b/meta-openbmc-mods/meta-common/recipes-core/logger-systemd/logger-systemd.inc index d808801c3..7dffc7c51 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/logger-systemd/logger-systemd.inc +++ b/meta-openbmc-mods/meta-common/recipes-core/logger-systemd/logger-systemd.inc @@ -19,7 +19,6 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=972a134f1e14b2b060e365df2fab0099 inherit autotools gettext pkgconfig DEPENDS = "libcap-ng ncurses virtual/crypt zlib systemd " #DEPENDS:intel-ast2500 += " systemd " -#RDEPENDS_${PN} += " libsystemd" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${MAJOR_VERSION}.tar.xz \ diff --git a/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc index 95061a570..872e78eba 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc +++ b/meta-openbmc-mods/meta-common/recipes-core/os-release/version-vars.inc @@ -53,12 +53,12 @@ python() { 'describe --long --abbrev=6 ' + '--match \'{}-[0-9]*\.[0-9]*\''.format(gen)) - # If no tag in meta-openbmc-mods, provide default version + # If no tag, provide default version if meta_vers.startswith('fatal:'): - meta_vers = '{}-0.0-0'.format(gen) + meta_vers = '{}-0.0-0-g0'.format(gen) meta_hash = irun_git(d, mibase, 'rev-parse HEAD') - # If no hash from meta-openbmc-mods, provide default + # If no hash, provide default if meta_hash.startswith('fatal:'): meta_hash = '00000000' version_id = '{}-{}'.format(meta_vers, obmc_hash[0:7]) -- cgit v1.2.3