diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-06-15 21:00:52 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-06-15 21:34:52 +0300 |
| commit | 057594a8bb8d062d72244196170c2d78947d318a (patch) | |
| tree | bd0ce34dac9b401ce5ac6919f1cd85239c526b82 /meta-openbmc-mods/meta-common/classes | |
| parent | 0ccb93d91de41b7db333efccc1aa8d03db1ef63f (diff) | |
| download | openbmc-057594a8bb8d062d72244196170c2d78947d318a.tar.xz | |
Update to internal 0.59
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/classes')
3 files changed, 8 insertions, 4 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 abbb0d2dc..344dddd3d 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 @@ -72,8 +72,12 @@ do_image_pfr () { mv ${PFR_IMAGES_DIR}/bmc_unsigned_cap.bin ${PFR_IMAGES_DIR}/bmc_unsigned_cap-${DATETIME}.bin mv ${PFR_IMAGES_DIR}/bmc_signed_cap.bin ${PFR_IMAGES_DIR}/bmc_signed_cap-${DATETIME}.bin mv ${PFR_IMAGES_DIR}/image-mtd-pfr ${PFR_IMAGES_DIR}/image-mtd-pfr-${DATETIME}.bin - ln -sf ${PFR_IMAGES_DIR}/image-mtd-pfr-${DATETIME}.bin ${PFR_IMAGES_DIR}/image-mtd-pfr.bin - ln -sf ${PFR_IMAGES_DIR}/bmc_signed_cap-${DATETIME}.bin ${PFR_IMAGES_DIR}/bmc_signed_cap.bin + + # Use relative links. The build process removes some of the build + # 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 bmc_signed_cap-${DATETIME}.bin ${PFR_IMAGES_DIR}/bmc_signed_cap.bin } do_image_pfr[vardepsexclude] += "DATE DATETIME" 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 4d50fbc52..1e6bc05af 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 @@ -22,7 +22,7 @@ IMAGE_INSTALL_append = " \ frb2-watchdog \ srvcfg-manager \ callback-manager \ - post-code-manager \ + phosphor-post-code-manager \ preinit-mounts \ mtd-utils-ubifs \ special-mode-mgr \ diff --git a/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass b/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass index 66fecb8a9..c088fec34 100644 --- a/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass +++ b/meta-openbmc-mods/meta-common/classes/systemd-watchdog.bbclass @@ -24,7 +24,7 @@ add_watchdog_confs() { mkdir -p "${folder}" fname="${folder}/watchdog.conf" echo "[Unit]" > ${fname} - echo "OnFailure=watchdog-reset.service" >> ${fname} + echo "OnFailure=watchdog-reset@${service}.service" >> ${fname} echo "[Service]" >> "${fname}" echo "StartLimitInterval=${interval}min" >> "${fname}" echo "StartLimitBurst=${count}" >> "${fname}" |