meta-inspur: Cleanup for Yocto override syntax change
Refer to: https://lore.kernel.org/openbmc/YQ1FD5q8KbhbXVBK@heinlein/
```
poky/scripts/contrib/convert-overrides.py meta-inspur
git grep "_[a-z0-9_/-]*[ :]" -- meta-inspur | grep ".bb"
git grep -l _fp5280g2 -- meta-inspur | xargs sed -i \
's/_fp5280g2/:fp5280g2/'
git grep -l _on5263m5 -- meta-inspur | xargs sed -i \
's/_on5263m5/:on5263m5/'
git grep -l _virtual -- meta-inspur | xargs sed -i \
's/_virtual/:virtual/'
```
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I5ef5039691caf5e33fb865da0fdd70d95d7e3bdf
diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/local.conf.sample
index 33fd6fd..e6decf4 100644
--- a/meta-inspur/meta-fp5280g2/conf/local.conf.sample
+++ b/meta-inspur/meta-fp5280g2/conf/local.conf.sample
@@ -1,11 +1,11 @@
MACHINE ??= "fp5280g2"
DISTRO ?= "openbmc-fp5280g2"
PACKAGE_CLASSES ?= "package_rpm"
-SANITY_TESTED_DISTROS_append ?= " *"
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
+SANITY_TESTED_DISTROS:append ?= " *"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
USER_CLASSES ?= "buildstats image-prelink"
PATCHRESOLVE = "noop"
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
STOPTASKS,${TMPDIR},1G,100K \
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \
diff --git a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
index 8666375..50cee79 100644
--- a/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
+++ b/meta-inspur/meta-fp5280g2/conf/machine/fp5280g2.conf
@@ -5,8 +5,8 @@
OBMC_POWER_SUPPLY_INSTANCES = "0 1"
-PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "fp5280g2-openpower-fru-vpd-layout-native"
-PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "fp5280g2-openpower-fru-inventory-native"
+PREFERRED_PROVIDER:virtual/openpower-fru-vpd-layout = "fp5280g2-openpower-fru-vpd-layout-native"
+PREFERRED_PROVIDER:virtual/openpower-fru-inventory = "fp5280g2-openpower-fru-inventory-native"
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend
index 4d2288f..500cfc0 100644
--- a/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append_fp5280g2 = " file://fp5280g2.cfg"
+SRC_URI:append:fp5280g2 = " file://fp5280g2.cfg"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend
index 960a978..0f93c1a 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend
@@ -1,3 +1,3 @@
-EXTRA_OEMESON_append = " \
+EXTRA_OEMESON:append = " \
-Dinsecure-tftp-update=enabled \
"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
index c10330b..1d4cfe1 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb
@@ -28,11 +28,11 @@
${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-inventory-sensors.yaml \
${datadir}/${BPN}/ipmi-sensors.yaml \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend
index 72d991c..4fc41d0 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb
index 5940009..01aee6a 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb
@@ -6,7 +6,7 @@
inherit allarch
inherit phosphor-dbus-monitor
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://config.yaml"
@@ -14,4 +14,4 @@
install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml
}
-FILES_${PN} += "${config_dir}/config.yaml"
+FILES:${PN} += "${config_dir}/config.yaml"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
index 570cb6b..779e364 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend
@@ -1 +1 @@
-PHOSPHOR_DBUS_MONITOR_CONFIGS_append_fp5280g2 = " events-policy"
+PHOSPHOR_DBUS_MONITOR_CONFIGS:append:fp5280g2 = " events-policy"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
index a5847a6..f48eef4 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
index a5847a6..f48eef4 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
index a5847a6..f48eef4 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
index 956e7bf..a29da8b 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
index a5847a6..f48eef4 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
index a5847a6..f48eef4 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend
index 2e3dcad..319cd16 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -1,21 +1,21 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
# Package configuration
FAN_PACKAGES += " \
phosphor-cooling-type \
"
-PACKAGECONFIG_append_fp5280g2 = " cooling-type"
+PACKAGECONFIG:append:fp5280g2 = " cooling-type"
TMPL_COOLING = "phosphor-cooling-type@.service"
INSTFMT_COOLING = "phosphor-cooling-type@{0}.service"
COOLING_TGT = "multi-user.target"
FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}"
-FILES_phosphor-cooling-type = "${bindir}/phosphor-cooling-type"
-SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}"
+FILES:phosphor-cooling-type = "${bindir}/phosphor-cooling-type"
+SYSTEMD_SERVICE:phosphor-cooling-type += "${TMPL_COOLING}"
SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}"
COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend
index a6cbb74..c83a2e9 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_fp5280g2 = " verify_pnor_signature"
+PACKAGECONFIG:append:fp5280g2 = " verify_pnor_signature"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
index 77ec086..6507870 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_append_fp5280g2 = " verify_signature"
+PACKAGECONFIG:append:fp5280g2 = " verify_signature"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 04d1c07..5fd9114 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service"
INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
POWERSUPPLY_TGT = "multi-user.target"
FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}"
-SYSTEMD_LINK_${PN}-presence_append_fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_LINK_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}"
POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend
index 27e7cf9..dc8ab86 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${PN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 5248c34..61c1b4b 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1 +1 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_fp5280g2 = " mboxd liberation-fonts uart-render-controller first-boot-set-mac"
+OBMC_IMAGE_EXTRA_INSTALL:append:fp5280g2 = " mboxd liberation-fonts uart-render-controller first-boot-set-mac"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb
index 11ff662..145078f 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb
@@ -15,4 +15,4 @@
install -D chassis.yaml ${D}${base_datadir}/events.d/chassis.yaml
}
-FILES_${PN} += "${base_datadir}/events.d/chassis.yaml"
+FILES:${PN} += "${base_datadir}/events.d/chassis.yaml"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
index 325086a..0620c2d 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG_append = " associations"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+PACKAGECONFIG:append = " associations"
SRC_URI += " file://associations.json"
DEPENDS += " phosphor-inventory-manager-chassis"
-do_install_append() {
+do_install:append() {
install -d ${D}${base_datadir}
install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json
}
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
index ecf943f..8daea02 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -1,5 +1,5 @@
-DEPENDS_append_fp5280g2= " fp5280g2-yaml-config"
+DEPENDS:append:fp5280g2= " fp5280g2-yaml-config"
-EXTRA_OECONF_fp5280g2= " \
+EXTRA_OECONF:fp5280g2= " \
INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-inventory-sensors.yaml \
"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 0eaffff..7182695 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
# Calculate the auxiliary firmware revision to be updated in the dev_id.json
# file. It is calculated from the VERSION_ID field which currently has two
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 3f7032c..19bb4df 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_fp5280g2= " fp5280g2-yaml-config"
+DEPENDS:append:fp5280g2= " fp5280g2-yaml-config"
-EXTRA_OECONF_fp5280g2= " \
+EXTRA_OECONF:fp5280g2= " \
YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml \
PROP_YAML=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-extra-properties.yaml \
"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 0694b7b..31f2a99 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_fp5280g2= " fp5280g2-yaml-config"
+DEPENDS:append:fp5280g2= " fp5280g2-yaml-config"
-EXTRA_OECONF_fp5280g2= " \
+EXTRA_OECONF:fp5280g2= " \
SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-sensors.yaml \
INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-inventory-sensors.yaml \
FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml \
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index ed96667..f4021e9 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://led-group-config.json"
-PACKAGECONFIG_append = " use-json use-lamp-test"
+PACKAGECONFIG:append = " use-json use-lamp-test"
-do_install_append() {
+do_install:append() {
install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
}
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend
index b6a7b0c..fb57578 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend
@@ -1 +1 @@
-MBOXD_FLASH_SIZE_fp5280g2 = "64M"
+MBOXD_FLASH_SIZE:fp5280g2 = "64M"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend
index b27014b..eedce86 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://mctp"
-do_install_append() {
+do_install:append() {
install -d ${D}${sysconfdir}/default
install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp
}
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend
index e8ac0e2..431768e 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG_append = " sync-mac"
+PACKAGECONFIG:append = " sync-mac"
SRC_URI += "file://config.json"
-FILES_${PN} += "${datadir}/network"
+FILES:${PN} += "${datadir}/network"
-do_install_append() {
+do_install:append() {
install -d ${D}${datadir}/network
install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/
}
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 58b4d8e..f4d97d7 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -6,14 +6,14 @@
phosphor-power-psu-monitor \
"
-RDEPENDS_${PN}-inventory_append_fp5280g2 = " \
+RDEPENDS:${PN}-inventory:append:fp5280g2 = " \
openpower-fru-vpd \
openpower-occ-control \
phosphor-cooling-type \
virtual/obmc-gpio-presence \
"
-RDEPENDS_${PN}-extras_append_fp5280g2 = " \
+RDEPENDS:${PN}-extras:append:fp5280g2 = " \
${POWER_SERVICE_PACKAGES_FP5280G2} \
phosphor-led-manager \
pldm \
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb
index 7c9e4f6..ce285f1 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb
@@ -16,5 +16,5 @@
install -m 0755 ${S}/fp5280g2-psu-update ${D}${bindir}/fp5280g2-psu-update
}
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend
index b9c22be..38efc16 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -1,15 +1,15 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
inherit obmc-phosphor-systemd
SRC_URI += "file://psu.json"
-PACKAGECONFIG_append = " monitor"
+PACKAGECONFIG:append = " monitor"
PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
-do_install_append() {
+do_install:append() {
install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json
}
-FILES_${PN} += "${datadir}/phosphor-power/psu.json"
+FILES:${PN} += "${datadir}/phosphor-power/psu.json"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend
index 6d4804d..1b6c912 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index b856e66..aacdd18 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-EXTRA_OEMESON_append_fp5280g2= " -Dnegative-errno-on-fail=true"
+EXTRA_OEMESON:append:fp5280g2= " -Dnegative-errno-on-fail=true"
CHIPS = " \
bus@1e78a000/i2c-bus@c0/tmp112@48 \
@@ -26,5 +26,5 @@
OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 70532c5..9e0c9c5 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += " file://sol-default.override.yml"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
index 27e7cf9..dc8ab86 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${PN}:"
diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/local.conf.sample
index 5defaa1..59f0046 100644
--- a/meta-inspur/meta-on5263m5/conf/local.conf.sample
+++ b/meta-inspur/meta-on5263m5/conf/local.conf.sample
@@ -114,7 +114,7 @@
# running the build on (i.e. building i686 packages on an x86_64 host).
# 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
@@ -138,7 +138,7 @@
# There are other application targets that can be used here too, see
# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
# We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
#
# Additional image features
@@ -190,7 +190,7 @@
# files and damages the build in ways which may not be easily recoverable.
# It's necessary to monitor /tmp, if there is no space left the build will fail
# with very exotic errors.
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
STOPTASKS,${TMPDIR},1G,100K \
STOPTASKS,${DL_DIR},1G,100K \
STOPTASKS,${SSTATE_DIR},1G,100K \
@@ -224,8 +224,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"
# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf
index 1c21791..9f76457 100644
--- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf
+++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf
@@ -4,11 +4,11 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps"
-PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps"
-PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps"
-PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
+PREFERRED_PROVIDER:virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER:virtual/obmc-fan-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER:virtual/obmc-flash-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER:virtual/obmc-system-mgmt = "packagegroup-inspur-apps"
+PREFERRED_PROVIDER:virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
UBOOT_MACHINE = "ast_g5_phy_config"
diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb
index 2174da9..441f218 100644
--- a/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb
+++ b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb
@@ -17,7 +17,7 @@
DEPENDS += "gpioplus"
-SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.inspur.identify_led.controller.service"
+SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.inspur.identify_led.controller.service"
SRC_URI = "git://github.com/inspur-bmc/inspur-uuid.git"
diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb
index 517b9eb..12fcdae 100644
--- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb
+++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb
@@ -16,30 +16,30 @@
PROVIDES += "virtual/obmc-flash-mgmt"
PROVIDES += "virtual/obmc-system-mgmt"
-RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
-RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt"
+RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt"
+RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt"
-SUMMARY_${PN}-chassis = "Inspur Chassis"
-RDEPENDS_${PN}-chassis = " \
+SUMMARY:${PN}-chassis = "Inspur Chassis"
+RDEPENDS:${PN}-chassis = " \
obmc-control-chassis \
obmc-op-control-power \
obmc-host-failure-reboots \
"
-SUMMARY_${PN}-fans = "Inspur Fans"
-RDEPENDS_${PN}-fans = ""
+SUMMARY:${PN}-fans = "Inspur Fans"
+RDEPENDS:${PN}-fans = ""
-SUMMARY_${PN}-flash = "Inspur Flash"
-RDEPENDS_${PN}-flash = " \
+SUMMARY:${PN}-flash = "Inspur Flash"
+RDEPENDS:${PN}-flash = " \
obmc-flash-bmc \
obmc-mgr-download \
obmc-control-bmc \
"
-SUMMARY_${PN}-system = "Inspur System"
-RDEPENDS_${PN}-system = " \
+SUMMARY:${PN}-system = "Inspur System"
+RDEPENDS:${PN}-system = " \
bmcweb \
entity-manager \
phosphor-webui \
diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index ac03883..867c388 100644
--- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-EXTRA_OEMESON_append_on5263m5= " -Dnegative-errno-on-fail=true"
+EXTRA_OEMESON:append:on5263m5= " -Dnegative-errno-on-fail=true"
CHIPS = " \
bus@1e78a000/i2c-bus@1c0/tmp112@48 \