diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/leds')
6 files changed, 18 insertions, 4 deletions
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-yaml-provider_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-yaml-provider_git.bb new file mode 100644 index 000000000..8c009fce3 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-yaml-provider_git.bb @@ -0,0 +1,10 @@ +SUMMARY = "phosphor-led-manager: install phosphor-logging yaml" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit phosphor-logging-yaml-provider +require phosphor-led-manager.inc + +S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 7b7790272..838c60a14 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "d02c3cb424653592daade4419b53ee52c1105c03" +SRCREV = "4c5f53371272641f27b584530e594883fcd447ef" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service index 8e852a4f8..5e361a38c 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager/xyz.openbmc_project.LED.GroupManager.service @@ -1,6 +1,8 @@ [Unit] Description=Phosphor LED Group Management Daemon Before=mapper-wait@-xyz-openbmc_project-led-groups.service +Wants=obmc-mapper.target +After=obmc-mapper.target [Service] Restart=always diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 9fdeea0f0..55171dbed 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -27,12 +27,15 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "systemd" DEPENDS += "phosphor-logging" +DEPENDS += "nlohmann-json" DEPENDS += "virtual/${PN}-config-native" +RDEPENDS_${PN}-ledmanager += "bash" + S = "${WORKDIR}/git" -FILES_${PN}-ledmanager += "${bindir}/phosphor-ledmanager" +FILES_${PN}-ledmanager += "${bindir}/phosphor-ledmanager ${bindir}/led-set-all-groups-asserted.sh" FILES_${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" DBUS_SERVICE_${PN}-ledmanager += "xyz.openbmc_project.LED.GroupManager.service" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 052aa850e..c3768c9d9 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -19,7 +19,7 @@ DBUS_SERVICE_${PN} += "xyz.openbmc_project.led.controller@.service" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" -SRCREV = "ca3dd7dd91830515251bbf91ba0644052c630be2" +SRCREV = "61b906367119b794a9788725fad86a3174bd83c0" S = "${WORKDIR}/git" do_install_append() { diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend b/meta-phosphor/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend deleted file mode 100644 index 3f2c5c811..000000000 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-logging-error-logs-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS += "phosphor-led-manager-error-native" |