diff options
Diffstat (limited to 'meta-inspur/meta-fp5280g2')
| -rw-r--r-- | meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 11 | ||||
| -rw-r--r-- | meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend | 3 |
2 files changed, 10 insertions, 4 deletions
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 9f1c10041..4a1ceb176 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}-inventory_append_fp5280g2 = " \ " 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 02f0d2bcd..9075cd38f 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 |