From b960ede462b1d2495a1251bcbe68ef5effad1eec Mon Sep 17 00:00:00 2001 From: "Andrey V.Kosteltsev" Date: Mon, 5 Sep 2022 18:59:03 +0300 Subject: Upstream phosphor-ipmi-* revisions --- ...bus-namespace-of-chassis-control-for-guid.patch | 43 ------------------- ...p12-Add-username-to-SessionInfo-interface.patch | 50 ---------------------- 2 files changed, 93 deletions(-) delete mode 100644 meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0001-Modify-dbus-namespace-of-chassis-control-for-guid.patch delete mode 100644 meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0002-rakp12-Add-username-to-SessionInfo-interface.patch (limited to 'meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net') diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0001-Modify-dbus-namespace-of-chassis-control-for-guid.patch b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0001-Modify-dbus-namespace-of-chassis-control-for-guid.patch deleted file mode 100644 index 6eb2325d6f..0000000000 --- a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0001-Modify-dbus-namespace-of-chassis-control-for-guid.patch +++ /dev/null @@ -1,43 +0,0 @@ -From da59ce9f701167120dc4a3fbef63d0cc4b8e988e Mon Sep 17 00:00:00 2001 -From: Kuiying Wang -Date: Mon, 2 Jul 2018 15:51:52 +0800 -Subject: [PATCH 1/2] Modify dbus namespace of chassis control for guid.cpp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Switch chassis control service namespace for guid.cpp from “org” to “xyz”, -to compatible with new intel-chassis services - -Signed-off-by: Kuiying Wang -Signed-off-by: Andrey V.Kosteltsev ---- - command/guid.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/command/guid.cpp b/command/guid.cpp -index c69f825..53a9c21 100644 ---- a/command/guid.cpp -+++ b/command/guid.cpp -@@ -21,7 +21,8 @@ namespace command - - std::unique_ptr matchPtr(nullptr); - --static constexpr auto guidObjPath = "/org/openbmc/control/chassis0"; -+static constexpr auto guidObjPath = -+ "/xyz/openbmc_project/Chassis/Control/Chassis0"; - static constexpr auto propInterface = "org.freedesktop.DBus.Properties"; - - Guid getSystemGUID() -@@ -31,7 +32,7 @@ Guid getSystemGUID() - Guid guid = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10}; - -- constexpr auto chassisIntf = "org.openbmc.control.Chassis"; -+ constexpr auto chassisIntf = "xyz.openbmc_project.Chassis.Control.Chassis"; - - sd_bus_message* reply = nullptr; - sd_bus_error error = SD_BUS_ERROR_NULL; --- -2.35.1 - diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0002-rakp12-Add-username-to-SessionInfo-interface.patch b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0002-rakp12-Add-username-to-SessionInfo-interface.patch deleted file mode 100644 index 3c7a939c9b..0000000000 --- a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0002-rakp12-Add-username-to-SessionInfo-interface.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9343b695d3128f5e1674987d0f001eb1cace5d03 Mon Sep 17 00:00:00 2001 -From: Jayaprakash Mutyala -Date: Tue, 1 Jun 2021 12:22:19 +0000 -Subject: [PATCH 2/2] rakp12: Add username to SessionInfo interface - -Add username to SessionInfo interface to get username info on individual -IPMI session Id's on Redfish - -Tested: -1. Activate SOL session -Command: ipmitool -I lanplus -U root -P 0penBmc -H -C 17 - sol activate -Response: // Success -2. Verified on SessionInfo D-bus interface. -busctl introspect xyz.openbmc_project.Ipmi.Channel.eth0 - /xyz/openbmc_project/ipmi/session/eth0/ -NAME TYPE SIGNATURE RESULT/VALUE FLAGS -...... -xyz.openbmc_project.Ipmi.SessionInfo interface - - - -.ChannelNum property y 3 emits-change writable -.CurrentPrivilege property y 4 emits-change writable -.RemoteIPAddr property u 22253066 emits-change writable -.RemoteMACAddress property ay 0 emits-change writable -.RemotePort property q 41096 emits-change writable -.SessionHandle property y 129 emits-change writable -.State property y 2 emits-change writable -.UserID property y 1 emits-change writable -.Username property s "root" emits-change writable - -Signed-off-by: Jayaprakash Mutyala -Signed-off-by: Andrey V.Kosteltsev ---- - command/rakp12.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/command/rakp12.cpp b/command/rakp12.cpp -index b8dc17c..3b2c49d 100644 ---- a/command/rakp12.cpp -+++ b/command/rakp12.cpp -@@ -250,6 +250,7 @@ std::vector RAKP12(const std::vector& inPayload, - } - session->channelNum(chNum); - session->userID(userId); -+ session->username(userName); - // minimum privilege of Channel / User / session::privilege::USER - // has to be used as session current privilege level - uint8_t minPriv = 0; --- -2.35.1 - -- cgit v1.2.3