From b96c75046da8f72359d101c813f0694409bbe0d1 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Fri, 6 Aug 2021 16:25:30 +0000 Subject: meta-ibm: prep for new override syntax Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba Signed-off-by: Adriana Kobylak --- meta-ibm/meta-palmetto/conf/layer.conf | 2 +- meta-ibm/meta-palmetto/conf/local.conf.sample | 6 +++--- meta-ibm/meta-palmetto/conf/machine/palmetto.conf | 2 +- meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- .../recipes-phosphor/configuration/palmetto-yaml-config.bb | 4 ++-- .../meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend | 2 +- .../meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend | 2 +- .../recipes-phosphor/images/obmc-phosphor-image.bbappend | 2 +- .../meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb | 2 +- .../inventory/phosphor-inventory-manager_%.bbappend | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend | 4 ++-- .../recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 4 ++-- meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend | 4 ++-- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 2 +- .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 4 ++-- .../recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) (limited to 'meta-ibm/meta-palmetto') diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index 9f2df6365..f40a9511d 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_palmetto-layer = "gatesgarth hardknott honister" diff --git a/meta-ibm/meta-palmetto/conf/local.conf.sample b/meta-ibm/meta-palmetto/conf/local.conf.sample index 3bdab8196..e25c4d912 100644 --- a/meta-ibm/meta-palmetto/conf/local.conf.sample +++ b/meta-ibm/meta-palmetto/conf/local.conf.sample @@ -115,7 +115,7 @@ PACKAGE_CLASSES ?= "package_rpm" # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" # # Extra image configuration defaults @@ -226,8 +226,8 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +PACKAGECONFIG:append:pn-qemu-native = " sdl" +PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" diff --git a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index 9e1c123ae..6f0e905cc 100644 --- a/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -6,7 +6,7 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc require conf/machine/include/p8.inc -UBOOT_MACHINE_palmetto = "ast_g4_ncsi_config" +UBOOT_MACHINE:palmetto = "ast_g4_ncsi_config" UBOOT_ENTRYPOINT = "0x40008000" UBOOT_LOADADDRESS = "0x40008000" diff --git a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend index 6cdb95135..62a07f4f7 100644 --- a/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" SRC_URI += "file://palmetto.cfg" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb b/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb index 44b47604d..c5c5bfdd5 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb +++ b/meta-ibm/meta-palmetto/recipes-phosphor/configuration/palmetto-yaml-config.bb @@ -22,10 +22,10 @@ do_install() { ${D}${datadir}/${BPN}/ipmi-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend index 2d3355993..3f6104063 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend index 2d3355993..3f6104063 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend index 755346060..6e76d4a96 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_palmetto = " mboxd" +OBMC_IMAGE_EXTRA_INSTALL:append:palmetto = " mboxd" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb index 0c4b56f72..1b5a119b1 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb +++ b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup.bb @@ -14,4 +14,4 @@ do_install() { install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml } -FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" +FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index d552f5763..7445c4e9e 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1 +1 @@ -DEPENDS_append = " inventory-cleanup" +DEPENDS:append = " inventory-cleanup" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index b69c6e109..cbd265e59 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_palmetto = " palmetto-yaml-config" +DEPENDS:append:palmetto = " palmetto-yaml-config" -EXTRA_OECONF_palmetto = " \ +EXTRA_OECONF:palmetto = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index db33e2886..5c0f8f783 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_palmetto = " palmetto-yaml-config" +DEPENDS:append:palmetto = " palmetto-yaml-config" -EXTRA_OECONF_palmetto = " \ +EXTRA_OECONF:palmetto = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend index b5ea3704a..c08c48507 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" -SRC_URI_append_palmetto = " file://palmetto.xml.patch.xml" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" +SRC_URI:append:palmetto = " file://palmetto.xml.patch.xml" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 52b9468cc..74635eac1 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}-inventory_append_palmetto = " openpower-occ-control phosphor-webui" +RDEPENDS:${PN}-inventory:append:palmetto = " openpower-occ-control phosphor-webui" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index bff849791..13b8535a5 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" NAMES = " \ bus@1e78a000/i2c-bus@40/rtc@68 \ @@ -10,4 +10,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 2d3355993..3f6104063 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:palmetto := "${THISDIR}/${PN}:" -- cgit v1.2.3