From 12fc939cde971ea2094201e48fe095c41138f4aa Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 6 Aug 2021 09:16:53 -0500 Subject: meta-phosphor: prep for new override syntax Signed-off-by: Patrick Williams Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5 --- meta-phosphor/conf/distro/include/phosphor-base.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-phosphor/conf/distro/include/phosphor-base.inc') diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index e42c8c20d..45f27a7df 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -62,8 +62,8 @@ OELAYOUT_ABI = "12" WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \ installed-vs-shipped ldflags pn-overrides rpaths staticdev \ useless-rpaths" -WARN_QA_remove = "${WARN_TO_ERROR_QA}" -ERROR_QA_append = " ${WARN_TO_ERROR_QA}" +WARN_QA:remove = "${WARN_TO_ERROR_QA}" +ERROR_QA:append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/no-static-libs.inc require conf/distro/include/yocto-uninative.inc @@ -112,14 +112,14 @@ MACHINE_FEATURES += " \ ${OBMC_MACHINE_FEATURES} \ " -DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel" +DISTRO_EXTRA_RDEPENDS:remove:qemuarm = "packagegroup-core-device-devel" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc -IMAGE_CLASSES_append = " image_types_phosphor phosphor-rootfs-postcommands" -IMAGE_CLASSES_append_npcm7xx = " image_types_phosphor_nuvoton" +IMAGE_CLASSES:append = " image_types_phosphor phosphor-rootfs-postcommands" +IMAGE_CLASSES:append:npcm7xx = " image_types_phosphor_nuvoton" -IMAGE_INSTALL_append = " dbus-broker libnss-systemd" +IMAGE_INSTALL:append = " dbus-broker libnss-systemd" # Skip the udev database by default. It adds around 2MB # compressed to the root filesystem, and probably doesn't @@ -129,7 +129,7 @@ BAD_RECOMMENDATIONS += "shared-mime-info" LAYER_CONF_VERSION ?= "8" -KERNEL_CLASSES_append = " obmc-phosphor-kernel-version" +KERNEL_CLASSES:append = " obmc-phosphor-kernel-version" # Some packages have directory trees of YAML files arranged based on # canonical organization names. 'xyz/openbmc_project' should be used -- cgit v1.2.3