meta-facebook: prep for new override syntax
Ran `scripts/contrib/convert-overrides.py` from upstream Yocto and
fixed up a few by hand that were missed.
Tested: Built bletchley and tiogapass.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I0489ba007132901697e4ef1a29b03a3591b3ee3b
diff --git a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb
index 1f476ad..ee72021 100644
--- a/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb
+++ b/meta-facebook/recipes-fb/fb-powerctrl/fb-powerctrl.bb
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
inherit obmc-phosphor-systemd
LICENSE = "Apache-2.0"
@@ -14,10 +14,10 @@
file://LICENSE"
DEPENDS = "systemd"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "host-gpio.service host-poweron.service host-poweroff.service"
+SYSTEMD_SERVICE:${PN} = "host-gpio.service host-poweron.service host-poweroff.service"
do_install() {
install -d ${D}/usr/sbin
diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
index 28586a9..9c7eff7 100755
--- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
+++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb
@@ -15,25 +15,25 @@
inherit cmake obmc-phosphor-ipmiprovider-symlink
EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1"
-EXTRA_OECMAKE_append_yosemitev2 = " -DBIC=1"
+EXTRA_OECMAKE:append:yosemitev2 = " -DBIC=1"
-EXTRA_OECMAKE_append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'"
+EXTRA_OECMAKE:append = " -DHOST_INSTANCES='${OBMC_HOST_INSTANCES}'"
LIBRARY_NAMES = "libzfboemcmds.so"
HOSTIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
NETIPMI_PROVIDER_LIBRARY += "${LIBRARY_NAMES}"
-FILES_${PN}_append = " ${datadir}/lcd-debug/post_desc.json"
-FILES_${PN}_append = " ${datadir}/lcd-debug/gpio_desc.json"
-FILES_${PN}_append = " ${datadir}/lcd-debug/cri_sensors.json"
+FILES:${PN}:append = " ${datadir}/lcd-debug/post_desc.json"
+FILES:${PN}:append = " ${datadir}/lcd-debug/gpio_desc.json"
+FILES:${PN}:append = " ${datadir}/lcd-debug/cri_sensors.json"
-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}"
+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}"
-do_install_append(){
+do_install:append(){
install -d ${D}${includedir}/fb-ipmi-oem
install -m 0644 -D ${S}/include/*.hpp ${D}${includedir}/fb-ipmi-oem
}
diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
index 6b61bba..d9c2abd 100644
--- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
+++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb
@@ -10,7 +10,7 @@
${PN}-flash \
${PN}-system \
"
-PACKAGES_append_fb-withhost = " \
+PACKAGES:append:fb-withhost = " \
${PN}-chassis \
${PN}-hostmgmt \
"
@@ -20,31 +20,31 @@
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 = "Facebook Chassis"
-RDEPENDS_${PN}-chassis = " \
+SUMMARY:${PN}-chassis = "Facebook Chassis"
+RDEPENDS:${PN}-chassis = " \
x86-power-control \
"
-SUMMARY_${PN}-extras_tiogapass = "Extra features for tiogapass"
-RDEPENDS_${PN}-extras_tiogapass = "phosphor-nvme"
+SUMMARY:${PN}-extras:tiogapass = "Extra features for tiogapass"
+RDEPENDS:${PN}-extras:tiogapass = "phosphor-nvme"
-SUMMARY_${PN}-fans = "Facebook Fans"
-RDEPENDS_${PN}-fans = " \
+SUMMARY:${PN}-fans = "Facebook Fans"
+RDEPENDS:${PN}-fans = " \
phosphor-pid-control \
"
-SUMMARY_${PN}-flash = "Facebook Flash"
-RDEPENDS_${PN}-flash = " \
+SUMMARY:${PN}-flash = "Facebook Flash"
+RDEPENDS:${PN}-flash = " \
phosphor-software-manager \
"
RDEPENDS_PN_SYSTEM_EXTRAS = ""
-RDEPENDS_PN_SYSTEM_EXTRAS_fb-withhost = " \
+RDEPENDS_PN_SYSTEM_EXTRAS:fb-withhost = " \
fb-powerctrl \
phosphor-ipmi-ipmb \
fb-ipmi-oem \
@@ -55,8 +55,8 @@
phosphor-host-postd \
"
-SUMMARY_${PN}-system = "Facebook System"
-RDEPENDS_${PN}-system = " \
+SUMMARY:${PN}-system = "Facebook System"
+RDEPENDS:${PN}-system = " \
entity-manager \
dbus-sensors \
phosphor-virtual-sensor \