diff options
| author | Lei YU <mine260309@gmail.com> | 2020-02-06 10:49:07 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-03-17 17:03:17 +0300 |
| commit | 856ad83d54a62c6cf7e8de6fcddcd93ef011cd7d (patch) | |
| tree | eb91c9115740787d9edc16b919115f6c52e3ce6e /meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend | |
| parent | 859d5b59c0e84a197c412c9a346affa4ea0f90f4 (diff) | |
| download | openbmc-856ad83d54a62c6cf7e8de6fcddcd93ef011cd7d.tar.xz | |
meta-witherspoon: Use separated phosphor-power packages
phosphor-power recipe is splitted into separated packages.
In packagegroup-obmc-apps.bbappend, define
POWER_SERVICE_PACKAGES_AC_SERVER to include the packages for IBM AC
servers and POWER_SERVICE_PACKAGES_RAINIER for rainier server.
The package cold-redundancy is not included yet because the repo does
not install the files yet.
In phosphor-power bbappend, use separated packages as well.
It also add phosphor-power to install the psu.json in witherspoon's
phosphor-power bbappend, which is needed for multiple packages.
Tested: Verify all the ac-server services and utils are installed into
Witherspoon's image as before.
(From meta-ibm rev: 438174de3490d800181ecd26ac162c6ebe442194)
Signed-off-by: Lei YU <mine260309@gmail.com>
Change-Id: I76808e92de7cf144ba2a3b7a455af582eaad3d33
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend')
| -rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend index 350c996d0..1caacd1e5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend @@ -4,9 +4,9 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON_${PN}-sequencer += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -DEPENDS += " power-sequencer" +DEPENDS_${PN}-sequencer += " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json @@ -14,4 +14,4 @@ do_install_append(){ FILES_${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" |