diff options
Diffstat (limited to 'meta-bytedance/meta-g220a/recipes-phosphor')
4 files changed, 69 insertions, 5 deletions
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager/g220a_baseboard.json b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager/g220a_baseboard.json index ae008da53..03a5d2aa3 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager/g220a_baseboard.json +++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager/g220a_baseboard.json @@ -908,6 +908,10 @@ "Name": "Host/BMC Shared NIC", "Type": "NIC" }, + { + "Name": "Node Manager Sensor", + "Type": "NMSensor" + }, { "Address": "0x70", "Bus": 3, @@ -2516,4 +2520,4 @@ "AssetTag": "$PRODUCT_ASSET_TAG" }, "xyz.openbmc_project.Inventory.Item.System": {} -}
\ No newline at end of file +} 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 e38c2721b..3059e809a 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 @@ -1,4 +1,6 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_g220a = " webui-vue \ - me-time-sync \ - static-mac-addr \ - " +OBMC_IMAGE_EXTRA_INSTALL_append_g220a = " \ + webui-vue \ + me-time-sync \ + static-mac-addr \ + phosphor-node-manager-proxy \ +" 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 new file mode 100644 index 000000000..837982da2 --- /dev/null +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch @@ -0,0 +1,35 @@ +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 new file mode 100644 index 000000000..1fa04843f --- /dev/null +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb @@ -0,0 +1,23 @@ +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 \ +" |