meta-google: Cleanup for Yocto override syntax change
```
convert-overrides.py meta-google
git grep "_[a-z0-9_/-]*[ :]" -- meta-google | grep ".bb"
git grep -l _gbmc -- meta-google | grep ".bb" \
| xargs sed -i 's/_gbmc/:gbmc/'
git grep -l _prod -- meta-google | grep ".bb" \
| xargs sed -i 's/_prod/:prod/'
git grep -l _dev -- meta-google | grep ".bb" \
| xargs sed -i 's/_dev/:dev/'
git grep -l _hoth -- meta-google | grep ".bb" \
| xargs sed -i 's/_hoth/:hoth/'
git grep -l _bandaid -- meta-google | grep ".bb" \
| xargs sed -i 's/_bandaid/:bandaid/'
```
Some small fix includes
```
platforms_gbmc_bringup
platforms_gbmc_secure
```
Tested:
```
$ git grep "_[a-z0-9_/-]*[ :]" -- meta-google | grep ".bb"
meta-google/recipes-connectivity/avahi/avahi_%.bbappend:do_install:append:gbmc() {
meta-google/recipes-core/dropbear/dropbear_%.bbappend:do_install:append:gbmc:dev() {
meta-google/recipes-core/dropbear/dropbear_%.bbappend: echo ' chain gbmc_br_pub_input {' >>"$rules"
meta-google/recipes-extended/libconfig/conf2struct-native_git.bb: oe_runmake checker
meta-google/recipes-extended/libconfig/conf2struct-native_git.bb: oe_runmake install
meta-google/recipes-extended/networking/mstpd_git.bb:do_install:append() {
meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake distclean
meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake sslh-conf.h
meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake install
meta-google/recipes-google/ipmi/ipmi-fru-sh.bb:do_install:append() {
meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb:do_install:append() {
meta-google/recipes-google/networking/gbmc-bridge.bb:do_rm_work:prepend() {
meta-google/recipes-google/networking/gbmc-bridge.bb: # HACK: Work around broken do_rm_work not properly calling rm with `--`
meta-google/recipes-google/networking/gbmc-ip-monitor.bb:do_install:append() {
meta-google/recipes-google/networking/gbmc-iperf3.bb:do_install:append:dev() {
meta-google/recipes-google/networking/gbmc-iperf3.bb: echo ' chain gbmc_br_pub_input {' >>"$rules"
meta-google/recipes-google/networking/gbmc-mac-config.bb:do_install:append() {
meta-google/recipes-google/networking/network-sh.bb:do_install:append() {
meta-google/recipes-google/ssh/authorized-keys-comp.bb:SUMMARY = "Compiles a set of authorized_keys files into a single file"
meta-google/recipes-google/ssh/authorized-keys-comp.bb:do_install:append() {
meta-google/recipes-google/systemd/gbmc-systemd-config.bb:do_install:append:dev() {
meta-google/recipes-google/test/test-sh.bb:do_install:append() {
meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb:do_install:prepend:dev() {
meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend:do_install:append:gbmc:dev() {
meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend:do_install:append:gbmc:dev() {
meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend:do_install:append:gbmc:prod() {
meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend:do_install:append:gbmc() {
meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend: overlapping="$(jq '."${GBMCBR_IPMI_CHANNEL}" | .is_valid and .name != "gbmcbr"' $chjson)"
```
Change-Id: I9d610c664bd44e8bd81fb8f7e76249a0b43b9ffd
Signed-off-by: Willy Tu <wltu@google.com>
diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf
index 0aca631..d365909 100644
--- a/meta-google/conf/distro/gbmc.conf
+++ b/meta-google/conf/distro/gbmc.conf
@@ -7,14 +7,14 @@
DISTRO_VERSION = "gbmc-release-${GBMC_VERSION}"
DISTROOVERRIDES .= ":gbmc"
-DISTRO_FEATURES_remove = "ldap"
-DISTRO_FEATURES_remove = "slp"
+DISTRO_FEATURES:remove = "ldap"
+DISTRO_FEATURES:remove = "slp"
# Required to get entity-manager to build with FruDevice service
-DISTRO_FEATURES_append = " ipmi-fru"
+DISTRO_FEATURES:append = " ipmi-fru"
WATCHDOG_PKG ?= "watchdog"
-SANITY_TESTED_DISTROS_append = " Debian-rodete \n debian-rodete \n "
+SANITY_TESTED_DISTROS:append = " Debian-rodete \n debian-rodete \n "
PREFERRED_PROVIDER_virtual/bmc-update ?= "inplace-gbmc-update"
diff --git a/meta-google/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-google/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend
index 1f704ca..cf7dd24 100644
--- a/meta-google/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-google/dynamic-layers/aspeed-layer/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/../../../../recipes-kernel/linux/files:"
-SRC_URI_append_gbmc = " file://gbmc.cfg"
-SRC_URI_append_gbmc_dev = " file://gbmc-dev.cfg"
-SRC_URI_append_gbmc_prod = " file://gbmc-prod.cfg"
+FILESEXTRAPATHS:prepend := "${THISDIR}/../../../../recipes-kernel/linux/files:"
+SRC_URI:append:gbmc = " file://gbmc.cfg"
+SRC_URI:append:gbmc:dev = " file://gbmc-dev.cfg"
+SRC_URI:append:gbmc:prod = " file://gbmc-prod.cfg"
diff --git a/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps-native_%.bbappend b/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
index 890ebbb..9eaffbf 100644
--- a/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
+++ b/meta-google/dynamic-layers/nuvoton-layer/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend_gbmc_hoth := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend:gbmc:hoth := "${THISDIR}/${BPN}:"
-SRC_URI_append_gbmc_hoth = " file://0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch"
+SRC_URI:append:gbmc:hoth = " file://0001-Set-FIU0_DRD_CFG-and-FIU_Clk_divider-for-gbmc-hoth.patch"
diff --git a/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend
index 8de09b1..4cae4ba 100644
--- a/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend
+++ b/meta-google/dynamic-layers/nuvoton-layer/recipes-kernel/linux/linux-nuvoton_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:${THISDIR}/../../../../recipes-kernel/linux/files:"
-SRC_URI_append_gbmc = " file://gbmc.cfg"
-SRC_URI_append_gbmc = " file://gbmc-nuvoton.cfg"
-SRC_URI_append_gbmc_dev = " file://gbmc-dev.cfg"
-SRC_URI_append_gbmc_prod = " file://gbmc-prod.cfg"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:${THISDIR}/../../../../recipes-kernel/linux/files:"
+SRC_URI:append:gbmc = " file://gbmc.cfg"
+SRC_URI:append:gbmc = " file://gbmc-nuvoton.cfg"
+SRC_URI:append:gbmc:dev = " file://gbmc-dev.cfg"
+SRC_URI:append:gbmc:prod = " file://gbmc-prod.cfg"
diff --git a/meta-google/recipes-connectivity/avahi/avahi_%.bbappend b/meta-google/recipes-connectivity/avahi/avahi_%.bbappend
index 8fb53d3..bdf5690 100644
--- a/meta-google/recipes-connectivity/avahi/avahi_%.bbappend
+++ b/meta-google/recipes-connectivity/avahi/avahi_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/files:"
-SRC_URI_append_gbmc = " file://avahi-daemon.conf"
-do_install_append_gbmc() {
+FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/files:"
+SRC_URI:append:gbmc = " file://avahi-daemon.conf"
+do_install:append:gbmc() {
install -m0644 ${WORKDIR}/avahi-daemon.conf ${D}${sysconfdir}/avahi/
}
diff --git a/meta-google/recipes-core/busybox/busybox_%.bbappend b/meta-google/recipes-core/busybox/busybox_%.bbappend
index 9d8cb2d..0f2210d 100644
--- a/meta-google/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-google/recipes-core/busybox/busybox_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/files:"
-SRC_URI_append_gbmc = " file://gbmc.cfg"
+FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/files:"
+SRC_URI:append:gbmc = " file://gbmc.cfg"
diff --git a/meta-google/recipes-core/dropbear/dropbear_%.bbappend b/meta-google/recipes-core/dropbear/dropbear_%.bbappend
index 0b4349e..f41990c 100644
--- a/meta-google/recipes-core/dropbear/dropbear_%.bbappend
+++ b/meta-google/recipes-core/dropbear/dropbear_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:"
-SRC_URI_append_gbmc = " file://dropbear.default"
-SYSTEMD_AUTO_ENABLE_${PN}_prod = "disable"
+FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:"
+SRC_URI:append:gbmc = " file://dropbear.default"
+SYSTEMD_AUTO_ENABLE:${PN}:prod = "disable"
-FILESEXTRAPATHS_remove_gbmc_bandaid := "${THISDIR}/${PN}:"
-SYSTEMD_AUTO_ENABLE_${PN}_bandaid_prod = "enable"
+FILESEXTRAPATHS:remove:gbmc:bandaid := "${THISDIR}/${PN}:"
+SYSTEMD_AUTO_ENABLE:${PN}:bandaid:prod = "enable"
# Allow SSH to the gbmc-bridge node on DEV builds
-do_install_append_gbmc_dev() {
+do_install:append:gbmc:dev() {
nftables_dir=${D}${sysconfdir}/nftables
rules=$nftables_dir/50-dropbear-dev.rules
install -d -m0755 $nftables_dir
diff --git a/meta-google/recipes-core/os-release/os-release.bbappend b/meta-google/recipes-core/os-release/os-release.bbappend
index ec6d64f..8c61bbc 100644
--- a/meta-google/recipes-core/os-release/os-release.bbappend
+++ b/meta-google/recipes-core/os-release/os-release.bbappend
@@ -7,4 +7,4 @@
d.setVar("BUILD_MEMO", memo)
}
-OS_RELEASE_FIELDS_append = " BUILD_MEMO"
+OS_RELEASE_FIELDS:append = " BUILD_MEMO"
diff --git a/meta-google/recipes-core/systemd/systemd_%.bbappend b/meta-google/recipes-core/systemd/systemd_%.bbappend
index d40168e..5975105 100644
--- a/meta-google/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-google/recipes-core/systemd/systemd_%.bbappend
@@ -1,8 +1,8 @@
# We want to be able to manage our coredumps
-PACKAGECONFIG_append_gbmc = " coredump"
+PACKAGECONFIG:append:gbmc = " coredump"
# Disable timesync as we don't use it and it makes rebooting much slower
-PACKAGECONFIG_remove_gbmc = "timesyncd"
+PACKAGECONFIG:remove:gbmc = "timesyncd"
# We don't need any legacy sysv rc compatability
-PACKAGECONFIG_remove_gbmc = "sysvinit"
+PACKAGECONFIG:remove:gbmc = "sysvinit"
diff --git a/meta-google/recipes-extended/networking/mstpd_git.bb b/meta-google/recipes-extended/networking/mstpd_git.bb
index 4c3f4ab..6970f51 100644
--- a/meta-google/recipes-extended/networking/mstpd_git.bb
+++ b/meta-google/recipes-extended/networking/mstpd_git.bb
@@ -13,12 +13,12 @@
inherit autotools pkgconfig systemd
PACKAGES =+ "${PN}-mstpd"
-FILES_${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl /sbin/bridge-stp"
+FILES:${PN}-mstpd = "${sbindir}/mstpd ${sbindir}/mstpctl /sbin/bridge-stp"
SYSTEMD_PACKAGES = "${PN}-mstpd"
-SYSTEMD_SERVICE_${PN}-mstpd = "mstpd.service"
+SYSTEMD_SERVICE:${PN}-mstpd = "mstpd.service"
-do_install_append() {
+do_install:append() {
rm -r ${D}${libexecdir}
install -d -m 0755 ${D}/sbin
diff --git a/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb b/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb
index 0755d4e..0de07f9 100644
--- a/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb
+++ b/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb
@@ -12,7 +12,7 @@
systemd \
"
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
acpi-power-state.service \
host-s0-state.target \
host-s5-state.target \
diff --git a/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb b/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb
index ecbb712..3cce4cd 100644
--- a/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb
+++ b/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb
@@ -5,7 +5,7 @@
SRC_URI += "file://certs/authority/"
-FILES_${PN} = "${sysconfdir}/ssl/certs/authority/*"
+FILES:${PN} = "${sysconfdir}/ssl/certs/authority/*"
do_install(){
install -d ${D}${sysconfdir}/ssl/certs/authority
diff --git a/meta-google/recipes-google/default-users/default-users.bb b/meta-google/recipes-google/default-users/default-users.bb
index 76485cc..1dbf215 100644
--- a/meta-google/recipes-google/default-users/default-users.bb
+++ b/meta-google/recipes-google/default-users/default-users.bb
@@ -8,16 +8,16 @@
DEPENDS = "bmcweb"
DEPENDS += "phosphor-ipmi-host"
DEPENDS += "phosphor-user-manager"
-RDEPENDS_${PN} = "bmcweb"
-RDEPENDS_${PN} += "phosphor-ipmi-host"
-RDEPENDS_${PN} += "phosphor-user-manager"
+RDEPENDS:${PN} = "bmcweb"
+RDEPENDS:${PN} += "phosphor-ipmi-host"
+RDEPENDS:${PN} += "phosphor-user-manager"
inherit useradd
USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "-m -N -u 1000 -g 100 -s /bin/nologin \
+USERADD_PARAM:${PN} = "-m -N -u 1000 -g 100 -s /bin/nologin \
-G 'web,redfish,priv-admin' Megapede; "
-GROUPMEMS_PARAM_${PN} = "-g priv-admin -a root; "
-GROUPMEMS_PARAM_${PN} += "-g ipmi -a root; "
+GROUPMEMS_PARAM:${PN} = "-g priv-admin -a root; "
+GROUPMEMS_PARAM:${PN} += "-g ipmi -a root; "
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb
index aeba2a9..3d5504e 100644
--- a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb
+++ b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb
@@ -16,9 +16,9 @@
SRC_URI = "git://github.com/openbmc/google-ipmi-i2c"
SRCREV = "b7d431199ac519e7c3cd5f3341d67f2ff0e09e10"
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
HOSTIPMI_PROVIDER_LIBRARY += "libi2ccmds.so"
diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb
index 801de43..1310f7e 100644
--- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb
+++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb
@@ -21,15 +21,15 @@
SRC_URI = "git://github.com/openbmc/google-ipmi-sys"
SRCREV = "b69209b498bf9b1c009c528e40280d13e68f8dbd"
-FILES_${PN} += "${libdir}/ipmid-providers"
+FILES:${PN} += "${libdir}/ipmid-providers"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
gbmc-host-poweroff.target \
gbmc-psu-hardreset.target \
"
EXTRA_OEMESON += "-Dtests=disabled"
-CXXFLAGS_append_gbmc = '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else \
+CXXFLAGS:append:gbmc = '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else \
" -DNCSI_IPMI_CHANNEL=1 -DNCSI_IF_NAME=" + d.getVar("GBMC_NCSI_IF_NAME")}'
diff --git a/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb b/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb
index deaee7a..881e623 100644
--- a/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb
+++ b/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb
@@ -3,14 +3,14 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://lib.sh"
S = "${WORKDIR}"
DATA = "${datadir}/ipmi-fru"
-FILES_${PN} += "${DATA}"
+FILES:${PN} += "${DATA}"
-do_install_append() {
+do_install:append() {
install -d -m0755 ${D}${DATA}
install -m0644 lib.sh ${D}${DATA}/
}
diff --git a/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb b/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb
index 531d824..9437478 100644
--- a/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb
+++ b/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb
@@ -13,6 +13,6 @@
protobuf \
"
-FILES_${PN} += "${libdir}/blob-ipmid"
+FILES:${PN} += "${libdir}/blob-ipmid"
EXTRA_OEMESON += "-Dtests=disabled"
diff --git a/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb b/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb
index 232872e..1737cdd 100644
--- a/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb
+++ b/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb
@@ -13,12 +13,12 @@
DEPENDS = "protobuf-native python3-protobuf"
-RDEPENDS_${PN}-generator += "python3 python3-protobuf"
+RDEPENDS:${PN}-generator += "python3 python3-protobuf"
-PACKAGES_prepend = "${PN}-generator ${PN}-runtime "
+PACKAGES:prepend = "${PN}-generator ${PN}-runtime "
-FILES_${PN}-generator = "${libdir}/python* ${bindir}"
+FILES:${PN}-generator = "${libdir}/python* ${bindir}"
-FILES_${PN}-runtime = "${libdir}/*.so.*"
+FILES:${PN}-runtime = "${libdir}/*.so.*"
BBCLASSEXTEND = "native"
diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
index 8989026..6480be1 100644
--- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
+++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb
@@ -16,25 +16,25 @@
S = "${WORKDIR}"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
gbmc-ip-monitor \
ncsid \
nftables-systemd \
sslh \
"
-FILES_${PN} += " \
+FILES:${PN} += " \
${datadir}/gbmc-ip-monitor \
${systemd_unitdir} \
"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
gbmc-ncsi-sslh.service \
gbmc-ncsi-sslh.socket \
gbmc-ncsi-set-nicenabled.service \
"
-do_install_append() {
+do_install:append() {
if_name='${GBMC_NCSI_IF_NAME}'
if [ -z "$if_name" ]; then
echo "Missing if_name" >&2
diff --git a/meta-google/recipes-google/ncsi/ncsid_git.bb b/meta-google/recipes-google/ncsi/ncsid_git.bb
index 1acb451..a67a310 100644
--- a/meta-google/recipes-google/ncsi/ncsid_git.bb
+++ b/meta-google/recipes-google/ncsi/ncsid_git.bb
@@ -10,7 +10,7 @@
-Dtests=disabled \
"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
dhcp4@.service \
dhcp6@.service \
ncsid@.service \
@@ -26,7 +26,7 @@
stdplus \
"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
bash \
busybox \
iputils-arping \
diff --git a/meta-google/recipes-google/networking/gbmc-bridge.bb b/meta-google/recipes-google/networking/gbmc-bridge.bb
index 37af84b..dea14f0 100644
--- a/meta-google/recipes-google/networking/gbmc-bridge.bb
+++ b/meta-google/recipes-google/networking/gbmc-bridge.bb
@@ -5,7 +5,7 @@
inherit systemd
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://-bmc-gbmcbr.netdev \
file://-bmc-gbmcbr.network.in \
@@ -22,14 +22,14 @@
file://gbmc-br-nft.sh \
"
-FILES_${PN}_append = " \
+FILES:${PN}:append = " \
${datadir}/gbmc-ip-monitor \
${systemd_unitdir}/network \
${sysconfdir}/nftables \
${sysconfdir}/avahi/services \
"
-RDEPENDS_${PN}_append = " \
+RDEPENDS:${PN}:append = " \
bash \
gbmc-ip-monitor \
mstpd-mstpd \
@@ -37,7 +37,7 @@
ndisc6-rdisc6 \
"
-SYSTEMD_SERVICE_${PN} += "gbmc-br-ensure-ra.service"
+SYSTEMD_SERVICE:${PN} += "gbmc-br-ensure-ra.service"
GBMC_BR_MAC_ADDR ?= ""
@@ -98,7 +98,7 @@
install -m0755 ${WORKDIR}/gbmc-br-ensure-ra.service ${D}${systemd_system_unitdir}/
}
-do_rm_work_prepend() {
+do_rm_work:prepend() {
# HACK: Work around broken do_rm_work not properly calling rm with `--`
# It doesn't like filenames that start with `-`
rm -rf -- ${WORKDIR}/-*
diff --git a/meta-google/recipes-google/networking/gbmc-ip-monitor.bb b/meta-google/recipes-google/networking/gbmc-ip-monitor.bb
index 3280430..1bf35bc 100644
--- a/meta-google/recipes-google/networking/gbmc-ip-monitor.bb
+++ b/meta-google/recipes-google/networking/gbmc-ip-monitor.bb
@@ -15,18 +15,18 @@
DEPENDS += "test-sh"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
bash \
iproute2 \
"
-SYSTEMD_SERVICE_${PN} += "gbmc-ip-monitor.service"
+SYSTEMD_SERVICE:${PN} += "gbmc-ip-monitor.service"
do_compile() {
SYSROOT="$PKG_CONFIG_SYSROOT_DIR" bash gbmc-ip-monitor-test.sh || exit
}
-do_install_append() {
+do_install:append() {
install -d -m0755 ${D}${libexecdir}
install -m0755 gbmc-ip-monitor.sh ${D}${libexecdir}/
diff --git a/meta-google/recipes-google/networking/gbmc-iperf3.bb b/meta-google/recipes-google/networking/gbmc-iperf3.bb
index 27ebdb7..3b78a40 100644
--- a/meta-google/recipes-google/networking/gbmc-iperf3.bb
+++ b/meta-google/recipes-google/networking/gbmc-iperf3.bb
@@ -5,11 +5,11 @@
inherit systemd
-RDEPENDS_${PN} += "iperf3"
+RDEPENDS:${PN} += "iperf3"
SRC_URI += "file://iperf3.service"
-SYSTEMD_SERVICE_${PN} += "iperf3.service"
+SYSTEMD_SERVICE:${PN} += "iperf3.service"
do_install() {
# Install service definitions
@@ -18,7 +18,7 @@
}
# Allow IPERF3 to run on the gbmcbr node on DEV builds
-do_install_append_dev() {
+do_install:append:dev() {
nftables_dir=${D}${sysconfdir}/nftables
rules=$nftables_dir/50-gbmc-iperf3-dev.rules
install -d -m0755 $nftables_dir
diff --git a/meta-google/recipes-google/networking/gbmc-mac-config.bb b/meta-google/recipes-google/networking/gbmc-mac-config.bb
index 6ca4c79..7a3781d 100644
--- a/meta-google/recipes-google/networking/gbmc-mac-config.bb
+++ b/meta-google/recipes-google/networking/gbmc-mac-config.bb
@@ -12,14 +12,14 @@
S = "${WORKDIR}"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
bash \
ipmi-fru-sh \
"
-FILES_${PN} += "${systemd_unitdir}"
+FILES:${PN} += "${systemd_unitdir}"
-SYSTEMD_SERVICE_${PN} += "gbmc-mac-config.service"
+SYSTEMD_SERVICE:${PN} += "gbmc-mac-config.service"
GBMC_MAC_EEPROM_OF_NAME ?= ""
@@ -28,7 +28,7 @@
# Ex. "[0]=eth0 [2]=eth2"
GBMC_MAC_IF_MAP ?= ""
-do_install_append() {
+do_install:append() {
if [ -z '${GBMC_MAC_EEPROM_OF_NAME}' ]; then
echo 'Missing GBMC_MAC_EEPROM_OF_NAME' >&2
exit 1
diff --git a/meta-google/recipes-google/networking/google-usb-network_git.bb b/meta-google/recipes-google/networking/google-usb-network_git.bb
index ec51eaa..f0d15b9 100644
--- a/meta-google/recipes-google/networking/google-usb-network_git.bb
+++ b/meta-google/recipes-google/networking/google-usb-network_git.bb
@@ -6,16 +6,16 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-FILESEXTRAPATHS_prepend = "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend = "${THISDIR}/${PN}:"
inherit systemd
DEPENDS += "m4-native"
DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "usb_network.service"
+SYSTEMD_SERVICE:${PN} = "usb_network.service"
BMC_IP_ADDR ??= "169.254.95.118/16"
BMC_USB_ECM_PRODUCT_ID ??= ""
@@ -30,8 +30,8 @@
SRC_URI += "file://usb_network.service.m4"
SRC_URI += "file://usb_network.sh"
-FILES_${PN} = "${bindir}/usb_network.sh"
-FILES_${PN}_append = " ${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME}"
+FILES:${PN} = "${bindir}/usb_network.sh"
+FILES:${PN}:append = " ${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME}"
do_compile() {
test "X${BMC_IP_ADDR}" != "X" || bberror "Please define BMC_IP_ADDR"
diff --git a/meta-google/recipes-google/networking/network-sh.bb b/meta-google/recipes-google/networking/network-sh.bb
index a377b9e..921795b 100644
--- a/meta-google/recipes-google/networking/network-sh.bb
+++ b/meta-google/recipes-google/networking/network-sh.bb
@@ -3,13 +3,13 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://lib.sh"
SRC_URI += "file://test.sh"
S = "${WORKDIR}"
DATA = "${datadir}/network"
-FILES_${PN} += "${DATA}"
+FILES:${PN} += "${DATA}"
DEPENDS += "test-sh"
@@ -17,7 +17,7 @@
SYSROOT="$PKG_CONFIG_SYSROOT_DIR" bash test.sh || exit
}
-do_install_append() {
+do_install:append() {
install -d -m0755 ${D}${DATA}
install -m0644 lib.sh ${D}${DATA}/
}
diff --git a/meta-google/recipes-google/nftables/nftables-systemd.bb b/meta-google/recipes-google/nftables/nftables-systemd.bb
index f4109dd..21a8b1a 100644
--- a/meta-google/recipes-google/nftables/nftables-systemd.bb
+++ b/meta-google/recipes-google/nftables/nftables-systemd.bb
@@ -13,9 +13,9 @@
file://nftables.service \
"
-SYSTEMD_SERVICE_${PN} += "nftables.service"
+SYSTEMD_SERVICE:${PN} += "nftables.service"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
bash \
nftables \
"
diff --git a/meta-google/recipes-google/ssh/authorized-keys-comp.bb b/meta-google/recipes-google/ssh/authorized-keys-comp.bb
index 81ee868..ef03792 100644
--- a/meta-google/recipes-google/ssh/authorized-keys-comp.bb
+++ b/meta-google/recipes-google/ssh/authorized-keys-comp.bb
@@ -12,15 +12,15 @@
S = "${WORKDIR}"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
-SYSTEMD_SERVICE_${PN} += "authorized-keys-comp.service"
+SYSTEMD_SERVICE:${PN} += "authorized-keys-comp.service"
-FILES_${PN} += "/home"
+FILES:${PN} += "/home"
AUTHORIZED_KEYS_COMP_USERS ?= "root"
-do_install_append() {
+do_install:append() {
install -d -m0755 ${D}${libexecdir}
install -m0755 authorized-keys-comp.sh ${D}${libexecdir}/
diff --git a/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb b/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb
index a9d371e..a402f51 100644
--- a/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb
+++ b/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb
@@ -7,7 +7,7 @@
S = "${WORKDIR}"
-FILES_${PN} += " ${datadir}/authorized_keys.d"
+FILES:${PN} += " ${datadir}/authorized_keys.d"
do_install() {
install -d ${D}${datadir}/authorized_keys.d/root
diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
index 29d81f4..6e26fc9 100644
--- a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
+++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
@@ -7,23 +7,23 @@
S = "${WORKDIR}"
-SRC_URI_append = " \
+SRC_URI:append = " \
file://firmware-updates.target \
file://firmware-updates-pre.target \
file://40-gbmc-forward.conf \
"
-FILES_${PN}_append = " \
+FILES:${PN}:append = " \
${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf \
${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf \
${libdir}/sysctl.d/40-gbmc-forward.conf \
"
-FILES_${PN}_append_dev = " \
+FILES:${PN}:append:dev = " \
${libdir}/sysctl.d/40-gbmc-debug.conf \
"
-SYSTEMD_SERVICE_${PN}_append = " \
+SYSTEMD_SERVICE:${PN}:append = " \
firmware-updates.target \
firmware-updates-pre.target \
"
@@ -46,7 +46,7 @@
install -m 0644 ${WORKDIR}/40-gbmc-forward.conf ${D}${libdir}/sysctl.d/
}
-do_install_append_dev() {
+do_install:append:dev() {
printf "kernel.sysrq = 1\n" \
>${D}${libdir}/sysctl.d/40-gbmc-debug.conf
}
diff --git a/meta-google/recipes-google/test/test-sh.bb b/meta-google/recipes-google/test/test-sh.bb
index 7edbb91..eaca137 100644
--- a/meta-google/recipes-google/test/test-sh.bb
+++ b/meta-google/recipes-google/test/test-sh.bb
@@ -3,19 +3,19 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://lib.sh"
SRC_URI += "file://test.sh"
S = "${WORKDIR}"
DATA = "${datadir}/test"
-FILES_${PN} += "${DATA}"
+FILES:${PN} += "${DATA}"
do_compile() {
SYSROOT="$PKG_CONFIG_SYSROOT_DIR" bash test.sh || exit
}
-do_install_append() {
+do_install:append() {
install -d -m0755 ${D}${DATA}
install -m0644 lib.sh ${D}${DATA}/
}
diff --git a/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend b/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend
index 8ba6e7c..47e290b 100644
--- a/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend
+++ b/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend
@@ -1,2 +1,2 @@
-PHOSPHOR_MAPPER_SERVICE_append = " com.google.gbmc"
-PHOSPHOR_MAPPER_INTERFACE_append = " com.google.gbmc"
+PHOSPHOR_MAPPER_SERVICE:append = " com.google.gbmc"
+PHOSPHOR_MAPPER_INTERFACE:append = " com.google.gbmc"
diff --git a/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb
index 7eba3b0..4bff6e3 100644
--- a/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb
+++ b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb
@@ -10,9 +10,9 @@
SRC_URI += "file://config-dummy.json"
SRC_URI += "file://dummy-verify.service"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash"
-SYSTEMD_SERVICE_${PN} += "dummy-verify.service"
+SYSTEMD_SERVICE:${PN} += "dummy-verify.service"
do_install() {
install -d ${D}${datadir}/phosphor-ipmi-flash
diff --git a/meta-google/recipes-phosphor/flash/google-key.bb b/meta-google/recipes-phosphor/flash/google-key.bb
index 2202115..62d54f2 100644
--- a/meta-google/recipes-phosphor/flash/google-key.bb
+++ b/meta-google/recipes-phosphor/flash/google-key.bb
@@ -5,8 +5,8 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-RDEPENDS_${PN} += "bash"
-RDEPENDS_${PN} += "gnupg"
+RDEPENDS:${PN} += "bash"
+RDEPENDS:${PN} += "gnupg"
SRC_URI += " \
file://platforms_gbmc_bringup.gpg \
diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb
index c71a579..9e55afc 100644
--- a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb
+++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb
@@ -8,10 +8,10 @@
inherit obmc-phosphor-systemd
PROVIDES += "virtual/bmc-update"
-RPROVIDES_${PN} += "virtual/bmc-update"
+RPROVIDES:${PN} += "virtual/bmc-update"
-RDEPENDS_${PN} += "google-key"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "google-key"
+RDEPENDS:${PN} += "bash"
SRC_URI += " \
file://config-bmc.json \
@@ -21,10 +21,10 @@
file://inplace-gbmc-version.sh \
"
-SYSTEMD_SERVICE_${PN} += "inplace-gbmc-verify.service"
-SYSTEMD_SERVICE_${PN} += "inplace-gbmc-version.service"
+SYSTEMD_SERVICE:${PN} += "inplace-gbmc-verify.service"
+SYSTEMD_SERVICE:${PN} += "inplace-gbmc-version.service"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash"
do_install() {
sed -i 's,@ALLOW_DEV@,,' ${WORKDIR}/inplace-gbmc-verify.sh
@@ -39,6 +39,6 @@
install -m 0644 ${WORKDIR}/config-bmc.json ${D}${datadir}/phosphor-ipmi-flash
}
-do_install_prepend_dev() {
+do_install:prepend:dev() {
sed -i 's,@ALLOW_DEV@,--allow-dev,' ${WORKDIR}/inplace-gbmc-verify.sh
}
diff --git a/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend
index 01669cc..204ed03 100644
--- a/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend
+++ b/meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend
@@ -2,6 +2,6 @@
# while the machine is booting. Especially when host serial logs also get
# written. This enables the verbose output of the daemon, providing
# the logging behavior.
-do_install_append_gbmc_dev() {
+do_install:append:gbmc:dev() {
sed -i '/^ExecStart=/ s,$, -v,' ${D}${systemd_system_unitdir}/lpcsnoop.service
}
diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 942dfc1..dce8682 100644
--- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,25 +1,25 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " google-ipmi-sys"
-OBMC_IMAGE_EXTRA_INSTALL_append = " google-ipmi-i2c"
-OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-blobs"
-OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-ethstats"
-OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-flash"
+OBMC_IMAGE_EXTRA_INSTALL:append = " google-ipmi-sys"
+OBMC_IMAGE_EXTRA_INSTALL:append = " google-ipmi-i2c"
+OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-blobs"
+OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-ethstats"
+OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-flash"
# Google BMC (gBMC) specific installs
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iproute2 iproute2-ss"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-systemd-config"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-iperf3"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " authorized-keys-comp"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc_dev = " gbmc-dev-ssh-key"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iproute2 iproute2-ss"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-systemd-config"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-iperf3"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " authorized-keys-comp"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc:dev = " gbmc-dev-ssh-key"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \
'${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else " gbmc-ncsi-config"}'
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \
'${@"" if not d.getVar("GBMC_MAC_EEPROM_OF_NAME") else " gbmc-mac-config"}'
# Include these useful utilities for all gbmc platforms
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " ipmitool"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iotools"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " lrzsz"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " ipmitool"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iotools"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " lrzsz"
# Add gBMC update recipes
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " dummy-gbmc-update"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " virtual/bmc-update"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " dummy-gbmc-update"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " virtual/bmc-update"
diff --git a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
index 905a39a..de696ef 100644
--- a/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
+++ b/meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend
@@ -1,20 +1,20 @@
# This is needed to guarantee that our whitelist takes
# precendence over the OpenBMC one
-FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:"
-SRC_URI_append_gbmc_dev = " file://whitelist.dev"
+SRC_URI:append:gbmc:dev = " file://whitelist.dev"
-do_install_append_gbmc_dev() {
+do_install:append:gbmc:dev() {
cat ${WORKDIR}/whitelist.dev >>${D}/whitelist
}
-SRC_URI_append_gbmc_dev = " file://rwfs-clean-dev.patch"
+SRC_URI:append:gbmc:dev = " file://rwfs-clean-dev.patch"
# Required for the clean-dev patch to detect version changes
-RDEPENDS_${PN}_append_gbmc_dev = " os-release"
+RDEPENDS:${PN}:append:gbmc:dev = " os-release"
-do_install_append_gbmc_prod() {
+do_install:append:gbmc:prod() {
echo "clean-rwfs-filesystem" > ${D}/init-options-base
chmod 0644 ${D}/init-options-base
}
-FILES_${PN}_append_gbmc_prod = " /init-options-base"
+FILES:${PN}:append:gbmc:prod = " /init-options-base"
diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 03e99b2..56f7933 100644
--- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1,13 +1,13 @@
-FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:"
-SRC_URI_append_gbmc = " file://gbmc_bridge.json"
+SRC_URI:append:gbmc = " file://gbmc_bridge.json"
-DEPENDS_append_gbmc = " jq-native"
+DEPENDS:append:gbmc = " jq-native"
GBMCBR_IPMI_CHANNEL ?= "11"
# Replace a channel in config.json to add gbmcbr reporting
-do_install_append_gbmc() {
+do_install:append:gbmc() {
chjson=${D}${datadir}/ipmi-providers/channel_config.json
overlapping="$(jq '."${GBMCBR_IPMI_CHANNEL}" | .is_valid and .name != "gbmcbr"' $chjson)"
if [ "$overlapping" != "false" ]; then
diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend
index 4519bae..0c05a9e 100644
--- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend
+++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend
@@ -1,2 +1,2 @@
# Enable registration via Google OEM Number in addition to OpenBMC.
-EXTRA_OECONF_append = " --enable-google"
+EXTRA_OECONF:append = " --enable-google"
diff --git a/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend
index 4a1cbe1..8003552 100644
--- a/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend
+++ b/meta-google/recipes-phosphor/network/phosphor-network_%.bbappend
@@ -1,3 +1,3 @@
# Platforms with Hoth don't use the U-Boot environment since this would allow
# bypassing attestation.
-PACKAGECONFIG_remove_hoth = "uboot-env"
+PACKAGECONFIG:remove:hoth = "uboot-env"
diff --git a/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 46d1123..764f0c8 100644
--- a/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-google/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,5 +1,5 @@
#Override the default time settings from BMC/NTP to Host/Manual, so that host
#can set BMC time via an IPMI command.
-FILESEXTRAPATHS_append_gbmc := ":${THISDIR}/${PN}"
-SRC_URI_append_gbmc = " file://timemanager-default-HOST-MANUAL.override.yml"
+FILESEXTRAPATHS:append:gbmc := ":${THISDIR}/${PN}"
+SRC_URI:append:gbmc = " file://timemanager-default-HOST-MANUAL.override.yml"