summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-common/classes
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2021-09-28 22:04:51 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2021-09-28 23:07:19 +0300
commitffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (patch)
tree8019999b0ca042482e5193d6cabc06220c71d776 /meta-openbmc-mods/meta-common/classes
parentd73e39703a0260c8911cb439b579e1c2bada4b20 (diff)
downloadopenbmc-ffe6d597d9e3d4407cf8062b5d6505a80ce08f41.tar.xz
Update to internal 0.75
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.bbclass2
-rw-r--r--meta-openbmc-mods/meta-common/classes/image_types_phosphor_auto.bbclass2
-rw-r--r--meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass11
-rw-r--r--meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-dev.bbclass2
4 files changed, 8 insertions, 9 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 2161cdf8d..470d5a10d 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
@@ -8,7 +8,7 @@ require recipes-core/os-release/version-vars.inc
IMAGE_TYPES += "intel-pfr"
-IMAGE_TYPEDEP_intel-pfr = "mtd-auto"
+IMAGE_TYPEDEP:intel-pfr = "mtd-auto"
IMAGE_TYPES_MASKED += "intel-pfr"
# PFR images directory
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 0c32e0e53..3efbfe092 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
@@ -14,7 +14,7 @@ OVERLAY_BASETYPE ?= "jffs2"
IMAGE_TYPES += "mtd-auto"
-IMAGE_TYPEDEP_mtd-auto = "${IMAGE_BASETYPE}"
+IMAGE_TYPEDEP:mtd-auto = "${IMAGE_BASETYPE}"
IMAGE_TYPES_MASKED += "mtd-auto"
# Flash characteristics in KB unless otherwise noted
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 036164585..e65e75c0c 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
@@ -30,7 +30,7 @@ IMAGE_FEATURES += " \
obmc-console \
"
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
dbus-broker \
entity-manager \
fru-device \
@@ -39,7 +39,6 @@ IMAGE_INSTALL_append = " \
phosphor-ipmi-ipmb \
phosphor-node-manager-proxy \
dbus-sensors \
- webui-vue \
at-scale-debug \
phosphor-pid-control \
phosphor-host-postd \
@@ -67,7 +66,6 @@ IMAGE_INSTALL_append = " \
id-led-off \
hsbp-manager \
security-registers-check \
- pch-time-sync \
nv-sync \
security-manager \
multi-node-nl \
@@ -79,13 +77,14 @@ IMAGE_INSTALL_append = " \
i3c-tools \
configure-usb-c \
zip \
+ peci-pcie \
"
-IMAGE_INSTALL_append = " ${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'pfr-manager', '', d)}"
+IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'pfr-manager', '', d)}"
-IMAGE_INSTALL_append = " ${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'ncsi-monitor', '', d)}"
+IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', 'ncsi-monitor', '', d)}"
# this package was flagged as a security risk
-IMAGE_INSTALL_remove += " lrzsz"
+IMAGE_INSTALL:remove += " lrzsz"
BAD_RECOMMENDATIONS += "phosphor-settings-manager"
diff --git a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-dev.bbclass b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-dev.bbclass
index 6a1ac3f14..1bc1653dc 100644
--- a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-dev.bbclass
+++ b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-dev.bbclass
@@ -1,4 +1,4 @@
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
mtd-util \
io-app \
intel-fw-update \