diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2021-04-30 18:54:48 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-05-12 18:49:59 +0300 |
| commit | cb3bd90ac6c9c97c9ef87287b82caa53cbbd8209 (patch) | |
| tree | 9b2e6d8ca2185e1f4599feafd81402d1a9cf5aed | |
| parent | 3452153a6e93bab2536c9665b817588ff7b33b8e (diff) | |
| download | openbmc-cb3bd90ac6c9c97c9ef87287b82caa53cbbd8209.tar.xz | |
phosphor-power: Only build monitor when told to
The 'monitor' package provides a power supply monitor application that
uses an org.open_power phosphor-dbus-interface that is only used
on a subset of the OpenPower systems.
So that non OpenPower systems can use phosphor-power and not need to
include the org.open_power D-Bus interfaces, add a packageconfig option
for this application to turn off its compilation. It will then only be
enabled for certain machines.
Fixes openbmc/phosphor-power#6
Tested:
Built Witherspoon, application still built and installed.
Built Rainier, application not built.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ib7fca16217d93b7d021ba8fb6659e9ddca17d1d9
| -rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend | 4 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index c8084b39e..c2f5b2cc5 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -11,6 +11,10 @@ EXTRA_OEMESON_append_mihawk = " -Dpower_sequencer=mihawk-cpld" DEPENDS_append_ibm-ac-server = " power-sequencer" DEPENDS_append_p10bmc = " power-sequencer" +PACKAGECONFIG_append_ibm-ac-server = " monitor" +PACKAGECONFIG_append_swift = " monitor" +PACKAGECONFIG_append_mihawk = " monitor" + do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json } diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb index 012b4939e..a01a99752 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -41,6 +41,10 @@ DEPENDS += " \ boost \ " +# The monitor package uses an org.open_power D-Bus interface and so +# should only build when told to. +PACKAGECONFIG[monitor] = "-Dsupply-monitor=true, -Dsupply-monitor=false" + SEQ_MONITOR_SVC = "pseq-monitor.service" SEQ_PGOOD_SVC = "pseq-monitor-pgood.service" PSU_MONITOR_TMPL = "power-supply-monitor@.service" @@ -51,7 +55,7 @@ REGS_MON_ENA_SVC = "phosphor-regulators-monitor-enable.service" REGS_MON_DIS_SVC = "phosphor-regulators-monitor-disable.service" SYSTEMD_SERVICE_${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" -SYSTEMD_SERVICE_${PN}-monitor = "${PSU_MONITOR_TMPL}" +SYSTEMD_SERVICE_${PN}-monitor = "${@bb.utils.contains('PACKAGECONFIG', 'monitor', '${PSU_MONITOR_TMPL}', '', d)}" SYSTEMD_SERVICE_${PN}-psu-monitor = "${PSU_MONITOR_SVC}" SYSTEMD_SERVICE_${PN}-regulators = "${REGS_SVC} ${REGS_CONF_SVC} ${REGS_MON_ENA_SVC} ${REGS_MON_DIS_SVC}" |