meta-phosphor: prep for new override syntax

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5

8 files changed, 27 insertions, 27 deletions

diff --git a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb
index 503e836a8..4fa3ff73f 100644
--- a/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb
+++ b/meta-phosphor/recipes-phosphor/flash/noverify-bmc-update.bb
@@ -8,9 +8,9 @@ SRC_URI += "file://noverify-bmc-update.service"
 SRC_URI += "file://noverify-bmc-verify.service"
 SRC_URI += "file://config-bmc.json"
 
-SYSTEMD_SERVICE_${PN} += "noverify-bmc-update.service"
-SYSTEMD_SERVICE_${PN} += "noverify-bmc-verify.service"
-FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
+SYSTEMD_SERVICE:${PN} += "noverify-bmc-update.service"
+SYSTEMD_SERVICE:${PN} += "noverify-bmc-verify.service"
+FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json"
 
 do_install() {
   install -d ${D}${datadir}/phosphor-ipmi-flash
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb
index 8ecc04237..d5e24a3d0 100644
--- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bios_git.bb
@@ -10,5 +10,5 @@ inherit obmc-phosphor-dbus-service
 inherit pkgconfig
 
 SKELETON_DIR = "flashbios"
-DBUS_SERVICE_${PN} += "org.openbmc.control.Flash.service"
-SYSTEMD_SERVICE_${PN} += "obmc-flash-init.service"
+DBUS_SERVICE:${PN} += "org.openbmc.control.Flash.service"
+SYSTEMD_SERVICE:${PN} += "obmc-flash-init.service"
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb
index 0a500f420..cd2b55581 100644
--- a/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-flash-bmc_git.bb
@@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}"
 inherit skeleton-python
 inherit obmc-phosphor-dbus-service
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
         python-dbus \
         python-compression \
         python-shell \
@@ -17,4 +17,4 @@ RDEPENDS_${PN} += "\
         "
 
 SKELETON_DIR = "pyflashbmc"
-DBUS_SERVICE_${PN} += "org.openbmc.control.BmcFlash.service"
+DBUS_SERVICE:${PN} += "org.openbmc.control.BmcFlash.service"
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb
index 6a6242037..a6cd66058 100644
--- a/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-mgr-download_git.bb
@@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}"
 inherit skeleton-python
 inherit obmc-phosphor-dbus-service
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
         python-dbus \
         python-pygobject \
         python-subprocess \
@@ -14,4 +14,4 @@ RDEPENDS_${PN} += "\
         "
 
 SKELETON_DIR = "pydownloadmgr"
-DBUS_SERVICE_${PN} += "org.openbmc.managers.Download.service"
+DBUS_SERVICE:${PN} += "org.openbmc.managers.Download.service"
diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb
index fe9473f6b..8c5d263a6 100644
--- a/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/obmc-op-flasher_git.bb
@@ -7,6 +7,6 @@ inherit skeleton-gdbus
 inherit pkgconfig
 
 DEPENDS += "pflash"
-RDEPENDS_${PN} += "pflash"
+RDEPENDS:${PN} += "pflash"
 
 SKELETON_DIR = "op-flasher"
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb
index 16e1d999f..d10eceffa 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-image-signing.bb
@@ -11,7 +11,7 @@ INSECURE_KEY = "${@'${SIGNING_KEY}' == '${STAGING_DIR_NATIVE}${datadir}/OpenBMC.
 DEPENDS += "openssl-native"
 DEPENDS += "${@oe.utils.conditional('INSECURE_KEY', 'True', 'phosphor-insecure-signing-key-native', '', d)}"
 
-FILES_${PN} += "${sysconfdir}/activationdata/"
+FILES:${PN} += "${sysconfdir}/activationdata/"
 
 SIGNING_KEY ?= "${STAGING_DIR_NATIVE}${datadir}/OpenBMC.priv"
 SIGNING_KEY_TYPE = "${@os.path.splitext(os.path.basename('${SIGNING_KEY}'))[0]}"
@@ -27,4 +27,4 @@ do_install() {
 	install -m 644 ${WORKDIR}/hashfunc ${idir}
 }
 
-SYSROOT_DIRS_append = " ${sysconfdir}"
+SYSROOT_DIRS:append = " ${sysconfdir}"
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb
index 85e289687..ffc343b93 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager-error-native_git.bb
@@ -11,7 +11,7 @@ require phosphor-software-manager.inc
 
 S = "${WORKDIR}/git"
 
-do_install_append() {
+do_install:append() {
     SRC=${S}/xyz/openbmc_project/Software/
     DEST=${D}${yaml_dir}/xyz/openbmc_project/Software/
     install -d ${DEST}
diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
index 4b0bdc060..fbc6d4bff 100644
--- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb
@@ -16,7 +16,7 @@ SOFTWARE_MGR_PACKAGES = " \
     ${PN}-sync \
 "
 PACKAGE_BEFORE_PN += "${SOFTWARE_MGR_PACKAGES}"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 DBUS_PACKAGES = "${SOFTWARE_MGR_PACKAGES}"
 
@@ -46,33 +46,33 @@ DEPENDS += " \
     sdbusplus \
 "
 
-RDEPENDS_${PN}-updater += " \
+RDEPENDS:${PN}-updater += " \
     bash \
     virtual-obmc-image-manager \
     ${@bb.utils.contains('PACKAGECONFIG', 'verify_signature', 'phosphor-image-signing', '', d)} \
 "
 
-RPROVIDES_${PN}-version += " \
+RPROVIDES:${PN}-version += " \
     virtual-obmc-image-manager \
 "
 
-FILES_${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf"
-FILES_${PN}-download-mgr += "${bindir}/phosphor-download-manager"
-FILES_${PN}-updater += " \
+FILES:${PN}-version += "${bindir}/phosphor-version-software-manager ${exec_prefix}/lib/tmpfiles.d/software.conf"
+FILES:${PN}-download-mgr += "${bindir}/phosphor-download-manager"
+FILES:${PN}-updater += " \
     ${bindir}/phosphor-image-updater \
     ${bindir}/obmc-flash-bmc \
     /usr/local \
     "
-FILES_${PN}-sync += " \
+FILES:${PN}-sync += " \
     ${bindir}/phosphor-sync-software-manager \
     ${sysconfdir}/synclist \
     "
-DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.Version.service"
-DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service"
-DBUS_SERVICE_${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service"
-DBUS_SERVICE_${PN}-sync += "xyz.openbmc_project.Software.Sync.service"
+DBUS_SERVICE:${PN}-version += "xyz.openbmc_project.Software.Version.service"
+DBUS_SERVICE:${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service"
+DBUS_SERVICE:${PN}-updater += "xyz.openbmc_project.Software.BMC.Updater.service"
+DBUS_SERVICE:${PN}-sync += "xyz.openbmc_project.Software.Sync.service"
 
-SYSTEMD_SERVICE_${PN}-updater += " \
+SYSTEMD_SERVICE:${PN}-updater += " \
     force-reboot.service \
     obmc-flash-bmc-setenv@.service \
     reboot-guard-disable.service \
@@ -80,12 +80,12 @@ SYSTEMD_SERVICE_${PN}-updater += " \
     usr-local.mount \
 "
 
-SYSTEMD_SERVICE_${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}"
+SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}"
 
 S = "${WORKDIR}/git"
 
 EXTRA_OEMESON += "-Dtests=disabled"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/usr/local
 }