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

Update

19 files changed, 73 insertions, 73 deletions

diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
index 83df346f5..ac1440338 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb
@@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/ipmi-blob-tool"
-SRCREV = "8da5f72db5a9d3374570cb860f52f35d518ac1c2"
+SRCREV = "2ca843c10ee5b26d1c2db41a54cb0feb967800d8"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
index a6a8198d2..7e024f19e 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
+++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 DEPENDS += "systemd"
 
@@ -19,8 +19,8 @@ SRC_URI += " \
     "
 
 # make sure that the enterprise-numbers file gets installed in the root FS
-FILES_${PN} += "/usr/share/misc/enterprise-numbers"
-do_compile_prepend() {
+FILES:${PN} += "/usr/share/misc/enterprise-numbers"
+do_compile:prepend() {
     # copy the SRC_URI version of enterprise-numbers
     # to the build dir to prevent a fetch
     mkdir -p "${WORKDIR}/build"
@@ -30,6 +30,6 @@ do_compile_prepend() {
 S = "${WORKDIR}/git"
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184"
 
-EXTRA_OECONF_append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus "
+EXTRA_OECONF:append = " --disable-ipmishell --enable-intf-dbus DEFAULT_INTF=dbus "
 
 PV = "1.8.18+git${SRCPV}"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
index 8f1d34b58..ec3d3a465 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb
@@ -19,8 +19,8 @@ S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore"
 SRCREV = "c3abe753fca211f49eb68f7d34e37bfc9eb5d4c4"
 
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/blob-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}/blob-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
 
 BLOBIPMI_PROVIDER_LIBRARY += "libbinarystore.so"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
index 58825d475..b989ef78c 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb
@@ -18,9 +18,9 @@ S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs"
 SRCREV = "f39e668c2b87c9453e0e28d5a8886b81ed80c50e"
 
-FILES_${PN} += "${libdir}/ipmid-providers"
+FILES:${PN} += "${libdir}/ipmid-providers"
 
-EXTRA_OEMESON += " \
+EXTRA_OEMESON:append = " \
   -Dtests=disabled \
   -Dexamples=false \
   "
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
index 6c7c82668..df5b65337 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 inherit autotools pkgconfig
 inherit obmc-phosphor-dbus-service
 
-DBUS_SERVICE_${PN} = "org.openbmc.HostIpmi.service"
+DBUS_SERVICE:${PN} = "org.openbmc.HostIpmi.service"
 
 PROVIDES += "virtual/obmc-host-ipmi-hw"
-RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw"
-RRECOMMENDS_${PN} += "phosphor-ipmi-host"
+RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
+RRECOMMENDS:${PN} += "phosphor-ipmi-host"
 
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "systemd"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
index 2d8b49105..24c4941dc 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb
@@ -17,7 +17,7 @@ SRC_URI = " \
     file://cs_privilege_levels.json \
     "
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${datadir}/ipmi-providers/cipher_list.json \
     ${datadir}/ipmi-providers/dcmi_cap.json \
     ${datadir}/ipmi-providers/dcmi_sensors.json \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
index 957dd36b2..e1da1570e 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb
@@ -16,10 +16,10 @@ S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats"
 SRCREV = "6b48b92e08abba4e7b31d69c9a74b1d262718a84"
 
-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 += "libethstatscmd.so"
 
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
index ce73cb06d..07ad73f5a 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb
@@ -44,14 +44,14 @@ EXTRA_OECONF = "--disable-tests --disable-build-host-tool"
 
 # Set this variable in your recipe to set it instead of using MAPPED_ADDRESS directly.
 IPMI_FLASH_BMC_ADDRESS ?= "0"
-EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}"
+EXTRA_OECONF:append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}"
 
 S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash"
-SRCREV = "0077e34cfaca539f750014aa63ff491dca70ee1d"
+SRCREV = "203ad80448552bb291cbebb9fdce362d58acc5f4"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \
+SYSTEMD_SERVICE:${PN} += "phosphor-ipmi-flash-bmc-prepare.target \
  phosphor-ipmi-flash-bmc-verify.target \
  phosphor-ipmi-flash-bmc-update.target"
 
@@ -60,12 +60,12 @@ HOST_BIOS_TARGETS = "phosphor-ipmi-flash-bios-prepare.target \
  phosphor-ipmi-flash-bios-verify.target \
  phosphor-ipmi-flash-bios-update.target"
 
-SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}"
+SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'host-bios', '${HOST_BIOS_TARGETS}', '', d)}"
 
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
-FILES_${PN}_append = " ${libdir}/tmpfiles.d"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/blob-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+FILES:${PN}:append = " ${libdir}/tmpfiles.d"
 
 BLOBIPMI_PROVIDER_LIBRARY += "libfirmwareblob.so"
 BLOBIPMI_PROVIDER_LIBRARY += "libversionblob.so"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
index ec10b7db2..b89311501 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bb
@@ -15,7 +15,7 @@ DEPENDS += "virtual/phosphor-ipmi-fru-read-bmc-inventory"
 DEPENDS += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory"
 PROVIDES += "virtual/phosphor-ipmi-fru-merge-config"
 
-do_install_append() {
+do_install:append() {
   SRC=${config_datadir}
   DEST=${D}${config_datadir}
   install -d ${DEST}
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
index d3b15c9f5..bb1addd08 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}"
 
 PROVIDES += "virtual/phosphor-ipmi-fru-read-bmc-inventory"
 
-do_install_append() {
+do_install:append() {
     DEST=${D}${config_datadir}
     install -d ${DEST}
     install bmc-fru-config.yaml ${DEST}/bmc-fru-config.yaml
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
index aad4aac1f..e87b8dfd0 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}"
 
 PROVIDES += "virtual/phosphor-ipmi-fru-read-not-sent-by-host-inventory"
 
-do_install_append() {
+do_install:append() {
     DEST=${D}${config_datadir}
     install -d ${DEST}
     install fru-config-not-sent-by-host.yaml ${DEST}/fru-config-not-sent-by-host.yaml
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
index 4ee1e16a3..c91fb7bd8 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb
@@ -25,27 +25,27 @@ DEPENDS += " \
         cli11 \
         "
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 SRC_URI += "file://of-name-to-eeprom.sh"
 
-SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service"
+SYSTEMD_SERVICE:${PN} += "obmc-read-eeprom@.service"
 
 S = "${WORKDIR}/git"
 
 HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so"
 
-FILES_${PN} += "${bindir}/of-name-to-eeprom.sh"
-FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
+FILES:${PN} += "${bindir}/of-name-to-eeprom.sh"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
 
 EXTRA_OECONF = " \
              YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \
              PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \
              "
 
-do_install_append() {
+do_install:append() {
         install -d ${D}${bindir}
         install -m 0755 ${WORKDIR}/of-name-to-eeprom.sh ${D}${bindir}
 }
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
index 38ca9ccec..3013ee9b1 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
-SRCREV = "8f1b0b932a7567d1d64733582e8d44e5e6734fec"
+SRCREV = "7a3296df0c2f9b8e04e5b60942fba086f999e1b9"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index 5e937648e..03d4e4f2f 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -5,7 +5,7 @@ PV = "1.0+git${SRCPV}"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-RRECOMMENDS_${PN} += "packagegroup-obmc-ipmid-providers-libs"
+RRECOMMENDS:${PN} += "packagegroup-obmc-ipmid-providers-libs"
 
 inherit autotools pkgconfig
 inherit obmc-phosphor-ipmiprovider-symlink
@@ -44,26 +44,26 @@ DEPENDS += "${PYTHON_PN}-mako-native"
 
 VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config"
 
-RDEPENDS_${PN}-dev += "phosphor-logging"
-RDEPENDS_${PN}-dev += "phosphor-mapper-dev"
-RDEPENDS_${PN} += "clear-once"
-RDEPENDS_${PN} += "phosphor-network"
-RDEPENDS_${PN} += "phosphor-time-manager"
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_ipmi-config}"
-RDEPENDS_${PN} += "virtual/obmc-watchdog"
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-state-manager}"
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-version}"
-RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-updater}"
+RDEPENDS:${PN}-dev += "phosphor-logging"
+RDEPENDS:${PN}-dev += "phosphor-mapper-dev"
+RDEPENDS:${PN} += "clear-once"
+RDEPENDS:${PN} += "phosphor-network"
+RDEPENDS:${PN} += "phosphor-time-manager"
+RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_ipmi-config}"
+RDEPENDS:${PN} += "virtual/obmc-watchdog"
+RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-state-manager}"
+RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-version}"
+RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_obmc-bmc-updater}"
 
 inherit useradd
 
 USERADD_PACKAGES = "${PN}"
 # add ipmi group
-GROUPADD_PARAM_${PN} = "ipmi"
+GROUPADD_PARAM:${PN} = "ipmi"
 
-SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service"
+SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service"
 
-RRECOMMENDS_${PN} += "phosphor-settings-manager"
+RRECOMMENDS:${PN} += "phosphor-settings-manager"
 
 
 require ${BPN}.inc
@@ -78,7 +78,7 @@ EXTRA_OECONF = " \
         INVSENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \
         FRU_YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \
         "
-EXTRA_OECONF_append = " \
+EXTRA_OECONF:append = " \
         WHITELIST_CONF="${WHITELIST_CONF}" \
         "
 
@@ -93,17 +93,17 @@ HOSTIPMI_PROVIDER_LIBRARY += "libusercmds.so"
 NETIPMI_PROVIDER_LIBRARY += "libipmi20.so"
 NETIPMI_PROVIDER_LIBRARY += "libusercmds.so"
 
-FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}"
-FILES_${PN}_append = " ${libdir}/ipmid-providers/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}/host-ipmid/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}"
+FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}"
+FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la"
 
 # Soft Power Off
 # install the soft power off service in the host shutdown target
 SOFT_SVC = "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service"
 SOFT_TGTFMT = "obmc-host-shutdown@{0}.target"
 SOFT_FMT = "../${SOFT_SVC}:${SOFT_TGTFMT}.requires/${SOFT_SVC}"
-SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'SOFT_FMT', 'OBMC_HOST_INSTANCES')}"
 
 #Collect all hardcoded sensor yamls from different recipes and
 #merge all of them with sensor.yaml.
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
index 489d09014..dbab372c9 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb
@@ -3,13 +3,13 @@ DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \
 implementing IPMB interfaces"
 
 SRC_URI = "git://github.com/openbmc/ipmbbridge.git"
-SRCREV = "8fe0abe6d9f69f735e93d7055687fce4b56e80bf"
+SRCREV = "bd78df6be9f677136ca190d50101c328267ddcd2"
 PV = "0.1+git${SRCPV}"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-SYSTEMD_SERVICE_${PN} = "ipmb.service"
+SYSTEMD_SERVICE:${PN} = "ipmb.service"
 
 DEPENDS = "sdbusplus \
            phosphor-logging \
@@ -19,4 +19,4 @@ DEPENDS = "sdbusplus \
 
 S = "${WORKDIR}/git"
 inherit cmake systemd
-FILES_${PN} += "/usr/share/ipmbbridge/ipmb-channels.json"
+FILES:${PN} += "/usr/share/ipmbbridge/ipmb-channels.json"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
index cd7f376d0..bff352e59 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
@@ -12,12 +12,12 @@ PV = "1.0+git${SRCPV}"
 
 KCS_DEVICE ?= "ipmi-kcs3"
 
-SYSTEMD_SERVICE_${PN} = "${PN}@${KCS_DEVICE}.service"
-FILES_${PN} += "${systemd_system_unitdir}/${PN}@.service"
+SYSTEMD_SERVICE:${PN} = "${PN}@${KCS_DEVICE}.service"
+FILES:${PN} += "${systemd_system_unitdir}/${PN}@.service"
 
 PROVIDES += "virtual/obmc-host-ipmi-hw"
-RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw"
-RRECOMMENDS_${PN} += "phosphor-ipmi-host"
+RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
+RRECOMMENDS:${PN} += "phosphor-ipmi-host"
 
 DEPENDS += " \
         fmt \
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
index 44a1b0c53..97df26289 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb
@@ -15,14 +15,14 @@ DEPENDS += "phosphor-mapper"
 DEPENDS += "systemd"
 DEPENDS += "phosphor-ipmi-host"
 
-RRECOMMENDS_${PN} = "pam-ipmi"
+RRECOMMENDS:${PN} = "pam-ipmi"
 
 SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid"
-SRCREV = "60d6e4ed2b74c88621f43081951d86956557baa0"
+SRCREV = "1c5b3ab05817d62a11f75c2a90b6891b18bf62cc"
 
 S = "${WORKDIR}/git"
 
-FILES_${PN} += " \
+FILES:${PN} += " \
         ${systemd_system_unitdir}/${PN}@.service \
         ${systemd_system_unitdir}/${PN}@.socket \
         "
@@ -32,7 +32,7 @@ DEFAULT_RMCPP_IFACE = "eth0"
 RMCPP_IFACE ?= "${DEFAULT_RMCPP_IFACE}"
 
 # install parameterized service and socket files
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
         ${PN}@${RMCPP_IFACE}.service \
         ${PN}@${RMCPP_IFACE}.socket \
         "
@@ -41,7 +41,7 @@ SYSTEMD_SERVICE_${PN} = " \
 # following lines in a bbappend:
 #
 # ALT_RMCPP_IFACE = "eth1"
-# SYSTEMD_SERVICE_${PN} += " \
+# SYSTEMD_SERVICE:${PN} += " \
 #     ${PN}@${ALT_RMCPP_IFACE}.service \
 #     ${PN}@${ALT_RMCPP_IFACE}.socket \
 #     "
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
index 6259e4feb..19c03fb79 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-config-native.bb
@@ -7,4 +7,4 @@ inherit native
 
 OBMC_IPMI_SENSORS_PROVIDERS = "phosphor-ipmi-sensor-inventory-mrw-config-native"
 
-DEPENDS_append = " ${OBMC_IPMI_SENSORS_PROVIDERS} "
+DEPENDS:append = " ${OBMC_IPMI_SENSORS_PROVIDERS} "
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb
index 821a74669..948ae6985 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ssif_git.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 inherit meson pkgconfig
 inherit systemd
 
-SYSTEMD_SERVICE_${PN} = "ssifbridge.service"
+SYSTEMD_SERVICE:${PN} = "ssifbridge.service"
 
 PROVIDES += "virtual/obmc-host-ipmi-hw"
-RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw"
-RRECOMMENDS_${PN} += "phosphor-ipmi-host"
+RPROVIDES:${PN} += "virtual-obmc-host-ipmi-hw"
+RRECOMMENDS:${PN} += "phosphor-ipmi-host"
 
 DEPENDS += "systemd"
 DEPENDS += "phosphor-logging"