From c06258c00235cb05d741309cb456e800cc6532d4 Mon Sep 17 00:00:00 2001
From: Lei YU <yulei.sh@bytedance.com>
Date: Mon, 25 Oct 2021 11:26:42 +0800
Subject: bytedance: g220a: Remove node manager

The node manager is maintained in
https://github.com/Intel-BMC/node-manager and it is not buildable with
latest OpenBMC.

The OpenBMC guideline[1] and the repotest[2] does not accept pathces in
machine layers, so the patches to node-manager are not accepted.

Remove the recipe for now, otherwise the build fails.

[1]:
https://github.com/openbmc/docs/blob/master/meta-layer-guidelines.md
[2]:
https://github.com/openbmc/openbmc-build-scripts/blob/master/build-setup.sh#L141

Signed-off-by: Lei YU <yulei.sh@bytedance.com>
Change-Id: I735f5b4d9b1cfa0ff4c0e47d349f99e847c0a7bd
---
 .../images/obmc-phosphor-image.bbappend            |  1 -
 .../0001-Remove-Total_Power-sensor.patch           | 35 ----------------------
 .../ipmi/phosphor-node-manager-proxy_git.bb        | 23 --------------
 3 files changed, 59 deletions(-)
 delete mode 100644 meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch
 delete mode 100644 meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb

(limited to 'meta-bytedance')

diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 038e65ec8..4759a8db6 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -2,6 +2,5 @@ OBMC_IMAGE_EXTRA_INSTALL:append:g220a = " \
     webui-vue \
     me-time-sync \
     static-mac-addr \
-    phosphor-node-manager-proxy \
     phosphor-virtual-sensor \
 "
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch
deleted file mode 100644
index 837982da2..000000000
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 086b098ea4160963cd09405fbdf6816bef095d16 Mon Sep 17 00:00:00 2001
-From: Lei YU <yulei.sh@bytedance.com>
-Date: Tue, 15 Dec 2020 16:50:31 +0800
-Subject: [PATCH] Remove Total_Power sensor
-
-The Total_Power sensor is not used on g220a system. Remove it.
-The sensor will be replaced by a virtual sensor.
-
-Tested: Verify the Total_Power sensor is gone on DBus.
-
-Signed-off-by: Lei YU <yulei.sh@bytedance.com>
----
- NodeManagerProxy.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/NodeManagerProxy.cpp b/NodeManagerProxy.cpp
-index d9fb760..9dbd5da 100644
---- a/NodeManagerProxy.cpp
-+++ b/NodeManagerProxy.cpp
-@@ -120,9 +120,9 @@ void createSensors()
-     // NM Statistics
-     // Global power statistics
-     configuredSensors.push_back(std::make_unique<PowerMetric>(server));
--    configuredSensors.push_back(std::make_unique<GlobalPowerPlatform>(
--        server, 0, 2040, "power", "Total_Power", globalPowerStats,
--        entirePlatform, 0));
-+//    configuredSensors.push_back(std::make_unique<GlobalPowerPlatform>(
-+//        server, 0, 2040, "power", "Total_Power", globalPowerStats,
-+//        entirePlatform, 0));
-     configuredSensors.push_back(
-         std::make_unique<GlobalPowerCpu>(server, 0, 510, "power", "CPU_Power",
-                                          globalPowerStats, cpuSubsystem, 0));
--- 
-2.25.1
-
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
deleted file mode 100644
index 4d9dd1b99..000000000
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Node Manager Proxy"
-DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \
-with Management Engine via IPMB"
-
-SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh"
-SRCREV = "23590b428ea26e0ed4b8225015471b962e3b3704"
-PV = "0.1+git${SRCPV}"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SYSTEMD_SERVICE:${PN} = "node-manager-proxy.service"
-
-DEPENDS = "sdbusplus \
-           phosphor-logging \
-           boost"
-
-S = "${WORKDIR}/git/"
-inherit cmake systemd
-
-SRC_URI:append = " \
-    file://0001-Remove-Total_Power-sensor.patch \
-"
-- 
cgit v1.2.3