diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/leds')
3 files changed, 16 insertions, 5 deletions
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index ad43e3d7f..920df3f96 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 = "cc9a575399bfcdb42f4ec3b78d840ca06f48ad58" +SRCREV = "ad73885b724ea826ffc60c23bdbaaab91ee3cb1c" 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 cce6fdef0..7d4e3281d 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -51,4 +51,14 @@ SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}" # Install the override to set up a Conflicts relation SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" -EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}" +EXTRA_OEMESON += "-Dtests=disabled" + +do_compile_prepend() { + if [ -f "${LED_YAML_PATH}/led.yaml" ]; then + cp "${LED_YAML_PATH}/led.yaml" "${S}/led.yaml" + elif [ -f "${STAGING_DATADIR_NATIVE}/${PN}/led.yaml" ]; then + cp "${STAGING_DATADIR_NATIVE}/${PN}/led.yaml" "${S}/led.yaml" + elif [ -f "${WORKDIR}/led.yaml" ]; then + cp "${WORKDIR}/led.yaml" "${S}/led.yaml" + fi +} 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 8e14d766d..f1a1112aa 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -6,10 +6,9 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-dbus-service -DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus" DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" @@ -17,9 +16,11 @@ DEPENDS += "boost" DBUS_SERVICE_${PN} += "xyz.openbmc_project.led.controller@.service" +EXTRA_OEMESON += "-Dtests=disabled" + SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" -SRCREV = "45eba6fc25260a3da68b6c4268af25be28c734c7" +SRCREV = "5ee5f3b7162cb5d8e6780a9571e0b0ca3daf7c6e" S = "${WORKDIR}/git" do_install_append() { |