diff options
| author | Zev Weiss <zev@bewilderbeest.net> | 2022-05-07 02:15:52 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-05-09 22:23:50 +0300 |
| commit | 5a9293114ff85c763cccbb8814d07f82ebdd8592 (patch) | |
| tree | 7eb9d9b41805eb53879fa12f76551b432cec7e26 | |
| parent | f871593ddbb71c4d57384a9470b7803f3f2b7b12 (diff) | |
| download | openbmc-5a9293114ff85c763cccbb8814d07f82ebdd8592.tar.xz | |
phosphor-power: Don't enable supply-monitor-ng by default
For the same reason as supply-monitor (a dependency on org.open_power
dbus interfaces).
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: Ibcf52fc180da744cced04d4720036d8bc84bf89c
| -rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend | 1 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 245ab999e4..ba65d70487 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -14,6 +14,7 @@ DEPENDS:append:p10bmc = " power-sequencer" PACKAGECONFIG:append:ibm-ac-server = " monitor" PACKAGECONFIG:append:swift = " monitor" PACKAGECONFIG:append:mihawk = " monitor" +PACKAGECONFIG:append:p10bmc = " monitor-ng" 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 a9bc167833..e2229b7022 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -43,9 +43,10 @@ DEPENDS += " \ libgpiod \ " -# The monitor package uses an org.open_power D-Bus interface and so +# The monitor packages use an org.open_power D-Bus interface and so # should only build when told to. PACKAGECONFIG[monitor] = "-Dsupply-monitor=true, -Dsupply-monitor=false" +PACKAGECONFIG[monitor-ng] = "-Dsupply-monitor-ng=true, -Dsupply-monitor-ng=false" SEQ_MONITOR_SVC = "pseq-monitor.service" SEQ_PGOOD_SVC = "pseq-monitor-pgood.service" @@ -59,7 +60,7 @@ POWER_CONTROL_SVC = "phosphor-power-control.service" SYSTEMD_SERVICE:${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" SYSTEMD_SERVICE:${PN}-monitor = "${@bb.utils.contains('PACKAGECONFIG', 'monitor', '${PSU_MONITOR_TMPL}', '', d)}" -SYSTEMD_SERVICE:${PN}-psu-monitor = "${PSU_MONITOR_SVC}" +SYSTEMD_SERVICE:${PN}-psu-monitor = "${@bb.utils.contains('PACKAGECONFIG', 'monitor-ng', '${PSU_MONITOR_SVC}', '', d)}" SYSTEMD_SERVICE:${PN}-regulators = "${REGS_SVC} ${REGS_CONF_SVC} ${REGS_MON_ENA_SVC} ${REGS_MON_DIS_SVC}" SYSTEMD_SERVICE:${PN}-control = "${POWER_CONTROL_SVC}" |