diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/classes')
3 files changed, 11 insertions, 1 deletions
diff --git a/meta-openbmc-mods/meta-common/classes/image_types_intel_pfr.bbclass b/meta-openbmc-mods/meta-common/classes/image_types_intel_pfr.bbclass index 9563b55cb..505391669 100644 --- a/meta-openbmc-mods/meta-common/classes/image_types_intel_pfr.bbclass +++ b/meta-openbmc-mods/meta-common/classes/image_types_intel_pfr.bbclass @@ -43,7 +43,7 @@ do_image_pfr () { cd "${PFR_IMAGES_DIR}" # python script that does the creating PFM, BMC compressed and unsigned images from BMC 128MB raw binary file. - ${PFR_SCRIPT_DIR}/pfr_image.py ${PFR_CFG_DIR}/pfr_manifest.json ${DEPLOY_DIR_IMAGE}/image-mtd ${build_version} ${build_number} ${build_hash} + ${PFR_SCRIPT_DIR}/pfr_image.py ${PFR_CFG_DIR}/pfr_manifest.json ${DEPLOY_DIR_IMAGE}/image-mtd ${build_version} ${build_number} ${build_hash} ${SHA} # sign the PFM region ${PFR_SCRIPT_DIR}/blocksign -c ${PFR_CFG_DIR}/pfm_config.xml -o ${PFR_IMAGES_DIR}/pfm_signed.bin ${PFR_IMAGES_DIR}/pfm.bin -v @@ -82,6 +82,10 @@ do_image_pfr[depends] += " \ " python() { + product_gen = d.getVar('PRODUCT_GENERATION', True) + if product_gen == "wht": + d.setVar('SHA', "1")# 1- SHA256 + types = d.getVar('IMAGE_FSTYPES', True).split() if 'intel-pfr' in types: diff --git a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass index b43933278..6d5ac0e2b 100644 --- a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass +++ b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass @@ -43,6 +43,8 @@ IMAGE_INSTALL_append = " \ security-manager \ multi-node-nl \ mctpd \ + virtual-media \ + enable-nics \ " IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'intel-pfr-manager', '', d)}" diff --git a/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass b/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass index 20b77d1be..66fecb8a9 100644 --- a/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass +++ b/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass @@ -12,6 +12,10 @@ add_watchdog_confs() { continue fi + if [ "$service" = "systemd-coredump@.service" ]; then + continue + fi + if cat $D/lib/systemd/system/${service} | grep oneshot > /dev/null; then continue fi |