meta-ibm: prep for new override syntax
Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf
index 9f2df63..f40a951 100644
--- a/meta-ibm/meta-palmetto/conf/layer.conf
+++ b/meta-ibm/meta-palmetto/conf/layer.conf
@@ -7,4 +7,4 @@
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 3bdab81..e25c4d9 100644
--- a/meta-ibm/meta-palmetto/conf/local.conf.sample
+++ b/meta-ibm/meta-palmetto/conf/local.conf.sample
@@ -115,7 +115,7 @@
# 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 @@
# 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 9e1c123..6f0e905 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/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 6cdb951..62a07f4 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 44b4760..c5c5bfd 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 @@
${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 2d33559..3f61040 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 2d33559..3f61040 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 7553460..6e76d4a 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 0c4b56f..1b5a119 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 @@
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 d552f57..7445c4e 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 b69c6e1..cbd265e 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 db33e28..5c0f8f7 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 b5ea370..c08c485 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 52b9468..74635ea 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 bff8497..13b8535 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 @@
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 2d33559..3f61040 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}:"