summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVishwanatha Subbanna <vishwa@linux.vnet.ibm.com>2017-03-27 12:06:58 +0300
committerVishwanatha Subbanna <vishwa@linux.vnet.ibm.com>2017-03-31 09:41:51 +0300
commit95b315192f5220fe0e2d08c30ee373140394ed46 (patch)
tree8fd6f17d668bf36173ec4bcaf0b1aa0e0e754b18
parentb33f84c487cf49fa65ab06e5ccb34911adc45fac (diff)
downloadopenbmc-95b315192f5220fe0e2d08c30ee373140394ed46.tar.xz
Define Generic LED groups for all the platforms
Regardless of the machine type, there needs to be standard set of LED groups that would get asserted / de-asserted under these conditions: 1) BMC booted 2) Power On 3) Power Off This makes sense on hardwares that have physical LEDs. However, QEMU does not have physical LEDs associated with the groups but the groups themselves can be in asserted state so that if physical LEDs are implemented in future, they can be used. Change-Id: Iaa081e59a356670b9f713db11bd45dbda55a6bd4 Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/phosphor-led-manager%.bbappend3
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/phosphor-led-manager%.bbappend11
-rw-r--r--meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb9
3 files changed, 9 insertions, 14 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/phosphor-led-manager%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/phosphor-led-manager%.bbappend
deleted file mode 100644
index 8138fecc2e..0000000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/phosphor-led-manager%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:${SYSTEMD_DEFAULT_TARGET}.wants/obmc-led-group-start@BmcBooted.service"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/phosphor-led-manager%.bbappend b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/phosphor-led-manager%.bbappend
deleted file mode 100644
index dbbbc8811c..0000000000
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/phosphor-led-manager%.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:${SYSTEMD_DEFAULT_TARGET}.wants/obmc-led-group-start@BmcBooted.service"
-
-STATES = "start stop"
-TMPLFMT = "obmc-led-group-{0}@.service"
-TGTFMT = "obmc-power-{0}@0.target"
-INSTFMT = "obmc-led-group-{0}@PowerOn.service"
-FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}"
-
-SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}"
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb
index 5ddc494220..7f24772210 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb
@@ -20,4 +20,13 @@ S = "${WORKDIR}/git"
DBUS_SERVICE_${PN} += "xyz.openbmc_project.LED.GroupManager.service"
SYSTEMD_SERVICE_${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service"
+SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:${SYSTEMD_DEFAULT_TARGET}.wants/obmc-led-group-start@bmc_booted.service"
+
+STATES = "start stop"
+TMPLFMT = "obmc-led-group-{0}@.service"
+TGTFMT = "obmc-power-{0}@0.target"
+INSTFMT = "obmc-led-group-{0}@power_on.service"
+FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}"
+
EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}"