From cb3bd90ac6c9c97c9ef87287b82caa53cbbd8209 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Fri, 30 Apr 2021 10:54:48 -0500 Subject: 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 Change-Id: Ib7fca16217d93b7d021ba8fb6659e9ddca17d1d9 --- meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta-phosphor') 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}" -- cgit v1.2.3