Update to internal 0.75

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

11 files changed, 69 insertions, 125 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 616fb9a75..73c3f2190 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1,17 +1,17 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += " file://dev_id.json \
              file://channel_access.json \
              file://channel_config.json \
              file://master_write_read_white_list.json \
            "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${datadir}/ipmi-providers/channel_access.json \
     ${datadir}/ipmi-providers/channel_config.json \
     ${datadir}/ipmi-providers/master_write_read_white_list.json \
     "
 
-do_install_append() {
+do_install:append() {
     install -m 0644 -D ${WORKDIR}/channel_access.json \
         ${D}${datadir}/ipmi-providers/channel_access.json
     install -m 0644 -D ${WORKDIR}/channel_config.json \
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bbappend
index 2d892ad1a..3a2cf0e01 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru-merge-config-native.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += " file://config.yaml"
 
 #override source file before it is used for final FRU file (merged from multiple sources)
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch
index bf1928825..112c1ffab 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0062-Update-IPMI-Chassis-Control-command.patch
@@ -1,4 +1,4 @@
-From 16eb5d80893406739518e7a56eb5191aa7e68257 Mon Sep 17 00:00:00 2001
+From 99f63d2af9f45badaa8aff4ef958443bea62ede8 Mon Sep 17 00:00:00 2001
 From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
 Date: Mon, 3 Jun 2019 17:01:47 -0700
 Subject: [PATCH] Update IPMI Chassis Control command
@@ -21,22 +21,22 @@ ipmitool power soft: soft power-off requested from system software
 Change-Id: Ic9fba3ca4abd9a758eb88f1e6ee09f7ca64ff80a
 Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
 ---
- chassishandler.cpp | 206 +++++++++++----------------------------------
- 1 file changed, 50 insertions(+), 156 deletions(-)
+ chassishandler.cpp | 204 +++++++++++----------------------------------
+ 1 file changed, 48 insertions(+), 156 deletions(-)
 
 diff --git a/chassishandler.cpp b/chassishandler.cpp
-index 4ca981d..cd0a13d 100644
+index dfbe004be490..cd0ba3402f84 100644
 --- a/chassishandler.cpp
 +++ b/chassishandler.cpp
-@@ -31,6 +31,7 @@
- #include <xyz/openbmc_project/Control/Boot/Mode/server.hpp>
+@@ -32,6 +32,7 @@
  #include <xyz/openbmc_project/Control/Boot/Source/server.hpp>
+ #include <xyz/openbmc_project/Control/Boot/Type/server.hpp>
  #include <xyz/openbmc_project/Control/Power/RestorePolicy/server.hpp>
 +#include <xyz/openbmc_project/State/Chassis/server.hpp>
  #include <xyz/openbmc_project/State/Host/server.hpp>
  #include <xyz/openbmc_project/State/PowerOnHours/server.hpp>
  
-@@ -813,59 +814,63 @@ ipmi::RspType<> ipmiSetChassisCap(bool intrusion, bool fpLockout,
+@@ -815,59 +816,63 @@ ipmi::RspType<> ipmiSetChassisCap(bool intrusion, bool fpLockout,
  //------------------------------------------
  // Calls into Host State Manager Dbus object
  //------------------------------------------
@@ -137,8 +137,8 @@ index 4ca981d..cd0a13d 100644
  }
  
  //------------------------------------------
-@@ -1298,76 +1303,6 @@ ipmi::RspType<uint4_t, // Restart Cause
-                                  CHANNEL_NOT_SUPPORTED);
+@@ -1302,76 +1307,6 @@ ipmi::RspType<uint4_t, // Restart Cause
+     return ipmi::responseSuccess(cause.value(), reserved, channel);
  }
  
 -//-------------------------------------------------------------
@@ -214,7 +214,7 @@ index 4ca981d..cd0a13d 100644
  /** @brief Implementation of chassis control command
   *
   *  @param - chassisControl command byte
-@@ -1380,63 +1315,22 @@ ipmi::RspType<> ipmiChassisControl(uint8_t chassisControl)
+@@ -1384,66 +1319,22 @@ ipmi::RspType<> ipmiChassisControl(uint8_t chassisControl)
      switch (chassisControl)
      {
          case CMD_POWER_ON:
@@ -259,9 +259,10 @@ index 4ca981d..cd0a13d 100644
              break;
 -
          case CMD_HARD_RESET:
+-            rc = initiate_state_transition(
 +            rc = initiateHostStateTransition(
-+                State::Host::Transition::ForceWarmReboot);
-+            break;
+                 State::Host::Transition::ForceWarmReboot);
+             break;
          case CMD_POWER_CYCLE:
 -            // SPEC has a section that says certain implementations can trigger
 -            // PowerOn if power is Off when a command to power cycle is
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch
deleted file mode 100644
index ff1d0baea..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 90df4bce744fdff6de98f63a320c50e24d40a0d4 Mon Sep 17 00:00:00 2001
-From: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com>
-Date: Mon, 2 Aug 2021 16:16:50 +0000
-Subject: [PATCH] Fix for BIOS boot type Legacy
-
-If user trying to set BIOS boot type as Legacy in Set System boot
-options IPMI command is getting success for boot option parameter 5
-(boot flags).
-Legacy boot type is not supported in Intel platforms, so returning
-InvalidFieldRequest. This can't be pushed to upstream as OEM's in
-community supports it.
-
-Tested:
-Verified using IPMI commands.
-//Set system boot options
-Command : ipmitool raw 0x00 0x08 0x05 0x80 0x18 0x00 0x00 0x00
-Response: Unable to send RAW command (channel=0x0 netfn=0x0 lun=0x0
-          cmd=0x8 rsp=0xcc): Invalid data field in request
-Command: ipmitool raw 0x00 0x08 0x05 0xa0 0x18 0x00 0x00 0x00
-Response:               //Success
-//Get System boot options
-Command : ipmitool raw 0x00 0x09 0x05 0x00 0x00
-Response:  01 05 a0 18 00 00 00
-
-Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com>
----
- chassishandler.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/chassishandler.cpp b/chassishandler.cpp
-index f7820af..abc84b6 100644
---- a/chassishandler.cpp
-+++ b/chassishandler.cpp
-@@ -1875,6 +1875,14 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx,
-         {
-             return ipmi::responseInvalidFieldRequest();
-         }
-+        constexpr auto biosBootTypeLegacy = 0;
-+        if (biosBootType == biosBootTypeLegacy)
-+        {
-+            // return error if BIOS boot type is legacy
-+            log<level::ERR>("ipmiChassisSetSysBootOptions: BIOS boot type "
-+                            "Legacy is not supported");
-+            return ipmi::responseInvalidFieldRequest();
-+        }
- 
-         using namespace chassis::internal;
-         using namespace chassis::internal::cache;
--- 
-2.17.1
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 84ae31e5c..c40ecad7e 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 PROJECT_SRC_DIR := "${THISDIR}/${PN}"
 
 SRC_URI += "file://phosphor-ipmi-host.service \
@@ -8,33 +8,32 @@ SRC_URI += "file://phosphor-ipmi-host.service \
             file://0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch \
             file://0062-Update-IPMI-Chassis-Control-command.patch \
             file://0063-Save-the-pre-timeout-interrupt-in-dbus-property.patch \
-            file://0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch \
             "
 
-EXTRA_OECONF_append = " --disable-i2c-whitelist-check"
-EXTRA_OECONF_append = " --enable-transport-oem=yes"
-EXTRA_OECONF_append = " --disable-boot-flag-safe-mode-support"
-EXTRA_OECONF_append = " --disable-ipmi-whitelist"
+EXTRA_OECONF:append = " --disable-i2c-whitelist-check"
+EXTRA_OECONF:append = " --enable-transport-oem=yes"
+EXTRA_OECONF:append = " --disable-boot-flag-safe-mode-support"
+EXTRA_OECONF:append = " --disable-ipmi-whitelist"
 
-RDEPENDS_${PN}_remove = "clear-once"
+RDEPENDS:${PN}:remove = "clear-once"
 
 # remove the softpoweroff service since we do not need it
-SYSTEMD_SERVICE_${PN}_remove += " \
+SYSTEMD_SERVICE:${PN}:remove += " \
     xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service"
 
-SYSTEMD_LINK_${PN}_remove += " \
+SYSTEMD_LINK_${PN}:remove += " \
     ../xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service:obmc-host-shutdown@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \
     "
-FILES_${PN}_remove = " \
-    ${systemd_unitdir}/system/obmc-host-shutdown@0.target.requires/ \
-    ${systemd_unitdir}/system/obmc-host-shutdown@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \
+FILES:${PN}:remove = " \
+    ${D}${systemd_unitdir}/system/obmc-host-shutdown@0.target.requires/ \
+    ${D}${systemd_unitdir}/system/obmc-host-shutdown@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \
     "
 
-do_compile_prepend(){
+do_compile:prepend(){
     cp -f ${PROJECT_SRC_DIR}/transporthandler_oem.cpp ${S}
 }
 
-do_install_append(){
+do_install:append(){
     rm -f ${D}/${bindir}/phosphor-softpoweroff
     rm -f ${S}/transporthandler_oem.cpp
 }
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index a83e1f670..465bd4c64 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,12 +1,12 @@
 SRC_URI = "git://github.com/openbmc/ipmbbridge.git"
-SRCREV = "8fe0abe6d9f69f735e93d7055687fce4b56e80bf"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRCREV = "bd78df6be9f677136ca190d50101c328267ddcd2"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://0001-Add-dbus-method-SlotIpmbRequest.patch \
            file://0002-Add-log-count-limitation-to-requestAdd.patch \
            file://ipmb-channels.json \
            "
 
-do_install_append() {
+do_install:append() {
     install -D ${WORKDIR}/ipmb-channels.json \
                ${D}/usr/share/ipmbbridge
 }
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
index a84352929..08b96ad71 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 #SYSTEMD_SUBSTITUTIONS_remove = "KCS_DEVICE:${KCS_DEVICE}:${DBUS_SERVICE_${PN}}"
 
@@ -8,14 +8,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 # Replace the '-' to '_', since Dbus object/interface names do not allow '-'.
 KCS_DEVICE = "ipmi_kcs3"
 SMM_DEVICE = "ipmi_kcs4"
-SYSTEMD_SERVICE_${PN}_append = " ${PN}@${SMM_DEVICE}.service "
+SYSTEMD_SERVICE:${PN}:append = " ${PN}@${SMM_DEVICE}.service "
 
 SRC_URI = "git://github.com/openbmc/kcsbridge.git"
 SRCREV = "03e6defcbca99c9c00cd37c4afb1d2b415a92acd"
 
 SRC_URI += "file://99-ipmi-kcs.rules"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${base_libdir}/udev/rules.d
     install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${base_libdir}/udev/rules.d/
 }
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0011-Remove-Get-SOL-Config-Command-from-Netipmid.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0011-Remove-Get-SOL-Config-Command-from-Netipmid.patch
index da173704b..7b690998f 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0011-Remove-Get-SOL-Config-Command-from-Netipmid.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0011-Remove-Get-SOL-Config-Command-from-Netipmid.patch
@@ -1,4 +1,4 @@
-From a36f181163974b2da0a954fc97a89fb2cdbd7287 Mon Sep 17 00:00:00 2001
+From adabdfa46aa0db56f40030c7077f991ba1987b04 Mon Sep 17 00:00:00 2001
 From: Cheng C Yang <cheng.c.yang@intel.com>
 Date: Tue, 30 Apr 2019 05:35:31 +0800
 Subject: [PATCH] Remove Get SOL Config Command from Netipmid
@@ -28,21 +28,21 @@ Payload Port                    : 623
 
 Signed-off-by: Cheng C Yang <cheng.c.yang@intel.com>
 ---
- command/sol_cmds.cpp |  91 ----------------------------
- command/sol_cmds.hpp | 168 ---------------------------------------------------
+ command/sol_cmds.cpp |  86 ----------------------
+ command/sol_cmds.hpp | 168 -------------------------------------------
  sol_module.cpp       |   6 --
- 3 files changed, 265 deletions(-)
+ 3 files changed, 260 deletions(-)
 
 diff --git a/command/sol_cmds.cpp b/command/sol_cmds.cpp
-index 804b5ea..8b2d041 100644
+index 81dfc993236c..be2cc81fc9cc 100644
 --- a/command/sol_cmds.cpp
 +++ b/command/sol_cmds.cpp
-@@ -65,97 +65,6 @@ void activating(uint8_t payloadInstance, uint32_t sessionID)
+@@ -69,92 +69,6 @@ void activating(uint8_t payloadInstance, uint32_t sessionID)
                                            outPayload);
  }
  
 -std::vector<uint8_t> getConfParams(const std::vector<uint8_t>& inPayload,
--                                   const message::Handler& handler)
+-                                   std::shared_ptr<message::Handler>& handler)
 -{
 -    std::vector<uint8_t> outPayload(sizeof(GetConfParamsResponse));
 -    auto request =
@@ -60,23 +60,22 @@ index 804b5ea..8b2d041 100644
 -    {
 -        case Parameter::PROGRESS:
 -        {
--            outPayload.push_back(
--                std::get<sol::Manager&>(singletonPool).progress);
+-            outPayload.push_back(sol::Manager::get().progress);
 -            break;
 -        }
 -        case Parameter::ENABLE:
 -        {
--            outPayload.push_back(std::get<sol::Manager&>(singletonPool).enable);
+-            outPayload.push_back(sol::Manager::get().enable);
 -            break;
 -        }
 -        case Parameter::AUTHENTICATION:
 -        {
 -            Auth value{0};
 -
--            value.encrypt = std::get<sol::Manager&>(singletonPool).forceEncrypt;
--            value.auth = std::get<sol::Manager&>(singletonPool).forceAuth;
--            value.privilege = static_cast<uint8_t>(
--                std::get<sol::Manager&>(singletonPool).solMinPrivilege);
+-            value.encrypt = sol::Manager::get().forceEncrypt;
+-            value.auth = sol::Manager::get().forceAuth;
+-            value.privilege =
+-                static_cast<uint8_t>(sol::Manager::get().solMinPrivilege);
 -            auto buffer = reinterpret_cast<const uint8_t*>(&value);
 -
 -            std::copy_n(buffer, sizeof(value), std::back_inserter(outPayload));
@@ -86,11 +85,9 @@ index 804b5ea..8b2d041 100644
 -        {
 -            Accumulate value{0};
 -
--            value.interval = std::get<sol::Manager&>(singletonPool)
--                                 .accumulateInterval.count() /
+-            value.interval = sol::Manager::get().accumulateInterval.count() /
 -                             sol::accIntervalFactor;
--            value.threshold =
--                std::get<sol::Manager&>(singletonPool).sendThreshold;
+-            value.threshold = sol::Manager::get().sendThreshold;
 -            auto buffer = reinterpret_cast<const uint8_t*>(&value);
 -
 -            std::copy_n(buffer, sizeof(value), std::back_inserter(outPayload));
@@ -100,10 +97,9 @@ index 804b5ea..8b2d041 100644
 -        {
 -            Retry value{0};
 -
--            value.count = std::get<sol::Manager&>(singletonPool).retryCount;
--            value.interval =
--                std::get<sol::Manager&>(singletonPool).retryInterval.count() /
--                sol::retryIntervalFactor;
+-            value.count = sol::Manager::get().retryCount;
+-            value.interval = sol::Manager::get().retryInterval.count() /
+-                             sol::retryIntervalFactor;
 -            auto buffer = reinterpret_cast<const uint8_t*>(&value);
 -
 -            std::copy_n(buffer, sizeof(value), std::back_inserter(outPayload));
@@ -119,8 +115,7 @@ index 804b5ea..8b2d041 100644
 -        }
 -        case Parameter::CHANNEL:
 -        {
--            outPayload.push_back(
--                std::get<sol::Manager&>(singletonPool).channel);
+-            outPayload.push_back(sol::Manager::get().channel);
 -            break;
 -        }
 -        case Parameter::NVBITRATE:
@@ -136,7 +131,7 @@ index 804b5ea..8b2d041 100644
  
  } // namespace sol
 diff --git a/command/sol_cmds.hpp b/command/sol_cmds.hpp
-index 182b73e..10cbf25 100644
+index 3e05e0fc035f..9aedfddf0d39 100644
 --- a/command/sol_cmds.hpp
 +++ b/command/sol_cmds.hpp
 @@ -62,174 +62,6 @@ struct ActivatingRequest
@@ -266,7 +261,7 @@ index 182b73e..10cbf25 100644
 - *  @return Response data for the command.
 - */
 -std::vector<uint8_t> setConfParams(const std::vector<uint8_t>& inPayload,
--                                   const message::Handler& handler);
+-                                   std::shared_ptr<message::Handler>& handler);
 -
 -/** @struct GetConfParamsRequest
 - *
@@ -309,16 +304,16 @@ index 182b73e..10cbf25 100644
 - *  @return Response data for the command.
 - */
 -std::vector<uint8_t> getConfParams(const std::vector<uint8_t>& inPayload,
--                                   const message::Handler& handler);
+-                                   std::shared_ptr<message::Handler>& handler);
 -
  } // namespace command
  
  } // namespace sol
 diff --git a/sol_module.cpp b/sol_module.cpp
-index 2b1fb46..6da82c0 100644
+index d9a9a7c9551f..21196d8a2cbf 100644
 --- a/sol_module.cpp
 +++ b/sol_module.cpp
-@@ -42,12 +42,6 @@ void registerCommands()
+@@ -41,12 +41,6 @@ void registerCommands()
           &getPayloadInfo,
           session::Privilege::USER,
           false},
@@ -332,5 +327,5 @@ index 2b1fb46..6da82c0 100644
  
      for (const auto& iter : commands)
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 759306cd0..bde839859 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -3,21 +3,21 @@ inherit useradd
 # TODO: This should be removed, once up-stream bump up
 # issue is resolved
 SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid"
-SRCREV = "b88599a2cef6b4fd2272f065a37ce0f70ca8dd38"
+SRCREV = "1c5b3ab05817d62a11f75c2a90b6891b18bf62cc"
 
 USERADD_PACKAGES = "${PN}"
 # add a group called ipmi
-GROUPADD_PARAM_${PN} = "ipmi "
+GROUPADD_PARAM:${PN} = "ipmi "
 
 # Default rmcpp iface is eth0; channel 1
 # Add channel 2 instance (eth1)
 RMCPP_EXTRA = "eth1"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
         ${PN}@${RMCPP_EXTRA}.service \
         ${PN}@${RMCPP_EXTRA}.socket \
         "
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " file://10-nice-rules.conf \
              file://0006-Modify-dbus-namespace-of-chassis-control-for-guid.patch \
@@ -25,7 +25,7 @@ SRC_URI += " file://10-nice-rules.conf \
              file://0012-rakp12-Add-username-to-SessionInfo-interface.patch \
            "
 
-do_install_append() {
+do_install:append() {
     mkdir -p ${D}${sysconfdir}/systemd/system/phosphor-ipmi-net@.service.d/
     install -m 0644 ${WORKDIR}/10-nice-rules.conf ${D}${sysconfdir}/systemd/system/phosphor-ipmi-net@.service.d/
 }
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
index 72d991c7e..4fc41d058 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
index d5c1888b3..3be0d30b4 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
@@ -3,13 +3,13 @@ DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicat
 with Management Engine via IPMB"
 
 SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh"
-SRCREV = "23590b428ea26e0ed4b8225015471b962e3b3704"
+SRCREV = "928d0994c7d8c1cc20dc69b763ecd62dcf8ab276"
 PV = "0.1+git${SRCPV}"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
-SYSTEMD_SERVICE_${PN} = "node-manager-proxy.service"
+SYSTEMD_SERVICE:${PN} = "node-manager-proxy.service"
 
 DEPENDS = "sdbusplus \
            phosphor-logging \