diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-02-28 02:57:13 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:57 +0300 |
commit | 6c1caca70063aa707ba809a6b4695d0f0c5646f1 (patch) | |
tree | 84da2f29a60cb571686d3a4fb93f9d1f1189d989 /meta-openbmc-mods/meta-common/classes | |
parent | 9600a7403ba2848c8751280077503a3e0f2f3481 (diff) | |
download | openbmc-6c1caca70063aa707ba809a6b4695d0f0c5646f1.tar.xz |
Update to internal 2020-02-27
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/classes')
-rw-r--r-- | meta-openbmc-mods/meta-common/classes/image_types_intel_pfr.bbclass | 2 | ||||
-rw-r--r-- | meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass | 4 |
2 files changed, 3 insertions, 3 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 e15812562..9563b55cb 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 @@ -74,7 +74,7 @@ do_image_pfr () { mv ${PFR_IMAGES_DIR}/image-mtd-pfr ${PFR_IMAGES_DIR}/image-mtd-pfr-${DATETIME}.bin } -do_image_pfr[vardepsexclude] += "DATETIME" +do_image_pfr[vardepsexclude] += "DATE DATETIME" do_image_pfr[vardeps] += "IPMI_MAJOR IPMI_MINOR IPMI_AUX13 IPMI_AUX14 IPMI_AUX15 IPMI_AUX16" do_image_pfr[depends] += " \ obmc-intel-pfr-image-native:do_populate_sysroot \ 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 802fa2bd5..7db3fa4a6 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 @@ -4,7 +4,6 @@ inherit systemd-watchdog IMAGE_INSTALL_append = " \ bmcweb \ dbus-broker \ - dtc \ entity-manager \ ipmitool \ intel-ipmi-oem \ @@ -12,7 +11,6 @@ IMAGE_INSTALL_append = " \ phosphor-node-manager-proxy \ dbus-sensors \ phosphor-webui \ - rest-dbus-static \ at-scale-debug \ phosphor-pid-control \ phosphor-host-postd \ @@ -42,6 +40,8 @@ IMAGE_INSTALL_append = " \ security-registers-check \ pch-time-sync \ nv-sync \ + security-manager \ + multi-node-nl \ " IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'intel-pfr-manager', '', d)}" |