Merge pull request #72 from Intel-BMC/update2021-0.751-0.75

Update

1 files changed, 15 insertions, 15 deletions

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..f51319adf 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"
+EXTRA_OEMESON:append = " -Dtests=disabled"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/usr/local
 }