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
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
index c8084b3..c2f5b2c 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -11,6 +11,10 @@
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 012b493..a01a997 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 @@
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_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}"