fp5280g2: power: fix the configuration related to PSU
Add the configuration related to PSU and confirm that these services
successfully updated to the image.
Tested: built successfully on fp5280g2
busctl --no-pager introspect xyz.openbmc_project.Inventory.Manager
/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0
NAME TYPE SIGNATURE RESULT/VALUE FLAGS
org.freedesktop.DBus.Introspectable interface - - -
.Introspect method - s -
org.freedesktop.DBus.Peer interface - - -
.GetMachineId method - s -
.Ping method - - -
org.freedesktop.DBus.Properties interface - - -
.Get method ss v -
.GetAll method s a{sv} -
.Set method ssv - -
.PropertiesChanged signal sa{sv}as - -
xyz.openbmc_project.Association.Definitions interface - - -
.Associations property a(sss) 5 "sensors" "inventory" "/xyz/openbmc_p… emits-change writable
xyz.openbmc_project.Inventory.Decorator.Asset interface - - -
.BuildDate property s "" emits-change writable
.Manufacturer property s "" emits-change writable
.Model property s "PS-2801-12L" emits-change writable
.PartNumber property s "V03101G000000000" emits-change writable
.SerialNumber property s "6K12A0118446MM" emits-change writable
xyz.openbmc_project.Inventory.Item interface - - -
.Present property b true emits-change writable
.PrettyName property s "powersupply0" emits-change writable
xyz.openbmc_project.Inventory.Item.PowerSupply interface - - -
(From meta-inspur rev: 90408ad10ce0647f51f44e9642b7c7901f625ed4)
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I37a347a21c217425d28a10fcebaced862e3e0218
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 9f1c100..4a1ceb1 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,3 +1,11 @@
+POWER_SERVICE_PACKAGES_FP5280G2 = " \
+ phosphor-power-monitor \
+ phosphor-power-systemd-links-monitor \
+ phosphor-power-utils \
+ phosphor-power \
+ phosphor-power-psu-monitor \
+ "
+
RDEPENDS_${PN}-inventory_append_fp5280g2 = " \
openpower-fru-vpd \
openpower-occ-control \
@@ -6,13 +14,12 @@
"
RDEPENDS_${PN}-extras_append_fp5280g2 = " \
+ ${POWER_SERVICE_PACKAGES_FP5280G2} \
phosphor-led-manager \
pldm \
mctp \
phosphor-fp5280g2-psu-update \
phosphor-psu-software-manager \
- phosphor-power \
- phosphor-power-systemd-links \
phosphor-webui \
"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend
index 02f0d2b..9075cd3 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -1,11 +1,10 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
inherit obmc-phosphor-systemd
SRC_URI += "file://psu.json"
PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
do_install_append() {
install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json