diff options
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend index 8bfef202fa..5c309e2e7a 100644 --- a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend @@ -3,4 +3,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # Remove, from the p10bmc image, the service file that starts the skeleton power # control application. That image will use the power control application # included in the phosphor-power repository. -DBUS_SERVICE:${PN}:remove:p10bmc = "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}" +OBMC_CONTROL_POWER_FMT:p10bmc = "" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index 8e0e38a0c9..4d8fb37ba1 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -11,8 +11,8 @@ DEPENDS += "phosphor-mapper systemd" SKELETON_DIR = "op-pwrctl" -FMT = "org.openbmc.control.Power@{0}.service" -DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}" +OBMC_CONTROL_POWER_FMT ?= "org.openbmc.control.Power@{0}.service" +DBUS_SERVICE:${PN} += "${@compose_list(d, 'OBMC_CONTROL_POWER_FMT', 'OBMC_POWER_INSTANCES')}" SYSTEMD_SERVICE:${PN} += " \ op-power-start@.service \ |