fp5280g2: Load LED manager with JSON configuration
Since the led manager used the default YAML to generated led-gen.hpp and
creates D-Bus object for the groups, and we tend to use JSON instead of
YAML to create it.
Tested: built successfully on phosphor-led-manager and create D-Bus
object used JSON configuration.
(From meta-inspur rev: 911c71c43beb4a3696f5c846bee06bc0a0d7bab2)
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: Ibc72f26519bb968ed4b4c8df4e068206ab9c0704
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
new file mode 100644
index 0000000..43dbdc9
--- /dev/null
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager/led-group-config.json
@@ -0,0 +1,35 @@
+{
+ "leds": [
+ {
+ "group": "bmc_booted",
+ "members": [
+ {
+ "Name": "power",
+ "Action": "Blink",
+ "DutyOn": 50,
+ "Period": 1000,
+ "Priority": "On"
+ },
+ {
+ "Name": "init_ok",
+ "Action": "On",
+ "DutyOn": 50,
+ "Period": 0,
+ "Priority": "On"
+ }
+ ]
+ },
+ {
+ "group": "power_on",
+ "members": [
+ {
+ "Name": "power",
+ "Action": "On",
+ "DutyOn": 50,
+ "Period": 0,
+ "Priority": "On"
+ }
+ ]
+ }
+ ]
+}
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
new file mode 100644
index 0000000..a122a72
--- /dev/null
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://led-group-config.json"
+
+EXTRA_OECONF = "--enable-use_json"
+
+DEPENDS += "phosphor-dbus-interfaces"
+
+do_install_append() {
+ install -d ${D}${datadir}/phosphor-led-manager/
+ install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/
+}
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index dc51a01..9f1c100 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,2 +1,18 @@
-RDEPENDS_${PN}-inventory_append_fp5280g2 = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence"
-RDEPENDS_${PN}-extras_append_fp5280g2 = " pldm mctp phosphor-fp5280g2-psu-update phosphor-psu-software-manager phosphor-power phosphor-power-systemd-links phosphor-webui"
+RDEPENDS_${PN}-inventory_append_fp5280g2 = " \
+ openpower-fru-vpd \
+ openpower-occ-control \
+ phosphor-cooling-type \
+ virtual/obmc-gpio-presence \
+ "
+
+RDEPENDS_${PN}-extras_append_fp5280g2 = " \
+ phosphor-led-manager \
+ pldm \
+ mctp \
+ phosphor-fp5280g2-psu-update \
+ phosphor-psu-software-manager \
+ phosphor-power \
+ phosphor-power-systemd-links \
+ phosphor-webui \
+ "
+