diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/classes')
3 files changed, 11 insertions, 0 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 344dddd3d..e961ae463 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 @@ -38,6 +38,7 @@ do_image_pfr () { bbplain "Build Version = ${build_version}" bbplain "Build Number = ${build_number}" bbplain "Build Hash = ${build_hash}" + bbplain "Build SHA = ${SHA_NAME}" mkdir -p "${PFR_IMAGES_DIR}" cd "${PFR_IMAGES_DIR}" @@ -77,7 +78,9 @@ do_image_pfr () { # artifacts and that makes fully qualified pathes break. Relative links # work because of the 'cd "${PFR_IMAGES_DIR}"' at the start of this section. ln -sf image-mtd-pfr-${DATETIME}.bin ${PFR_IMAGES_DIR}/image-mtd-pfr.bin + ln -sf image-mtd-pfr-${DATETIME}.bin ${PFR_IMAGES_DIR}/OBMC-${@ do_get_version(d)}-pfr-full.ROM ln -sf bmc_signed_cap-${DATETIME}.bin ${PFR_IMAGES_DIR}/bmc_signed_cap.bin + ln -sf bmc_signed_cap-${DATETIME}.bin ${PFR_IMAGES_DIR}/OBMC-${@ do_get_version(d)}-pfr-oob.bin } do_image_pfr[vardepsexclude] += "DATE DATETIME" @@ -91,6 +94,7 @@ python() { product_gen = d.getVar('PRODUCT_GENERATION', True) if product_gen == "wht": d.setVar('SHA', "1")# 1- SHA256 + d.setVar('SHA_NAME', "SHA256") types = d.getVar('IMAGE_FSTYPES', True).split() diff --git a/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass b/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass index f90a19c4b..0c32e0e53 100644 --- a/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass +++ b/meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass @@ -60,6 +60,7 @@ do_generate_auto() { ln ${IMGDEPLOYDIR}/${IMAGE_NAME}.auto.mtd \ ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.auto.mtd ln -sf ${IMAGE_NAME}.auto.mtd ${DEPLOY_DIR_IMAGE}/image-mtd + ln -sf ${IMAGE_NAME}.auto.mtd ${DEPLOY_DIR_IMAGE}/OBMC-${@ do_get_version(d)}.ROM } do_generate_auto[dirs] = "${S}/auto" do_generate_auto[depends] += " \ diff --git a/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass b/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass index c088fec34..ad49eed82 100644 --- a/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass +++ b/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass @@ -28,6 +28,12 @@ add_watchdog_confs() { echo "[Service]" >> "${fname}" echo "StartLimitInterval=${interval}min" >> "${fname}" echo "StartLimitBurst=${count}" >> "${fname}" + echo "RestartSec=60" >> "${fname}" + + if cat $D/lib/systemd/system/${service} | grep Restart > /dev/null; then + continue + fi + echo "Restart=on-failure" >> "${fname}" done } |