diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/leds')
5 files changed, 22 insertions, 21 deletions
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb index 648bf2140..c4724f2e7 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb @@ -10,7 +10,7 @@ PROVIDES += "virtual/phosphor-led-manager-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" # Generate a YAML files based on MRW input -do_install_append() { +do_install:append() { USE_MRW="${@bb.utils.contains('DISTRO_FEATURES', 'obmc-mrw', 'yes', 'no', d)}" DEST=${D}${datadir}/phosphor-led-manager diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb index 5d86f8aeb..0e1baadef 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager-error-native_git.bb @@ -11,7 +11,7 @@ require phosphor-led-manager.inc S = "${WORKDIR}/git" -do_install_append() { +do_install:append() { SRC=${S}/xyz/openbmc_project/Led/ DEST=${D}${yaml_dir}/xyz/openbmc_project/Led/ install -d ${DEST}/Fru diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 920df3f96..544beae35 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 = "ad73885b724ea826ffc60c23bdbaaab91ee3cb1c" +SRCREV = "7152edcff6b44cd3b32ced057c1fd2e6ac6402e9" 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 7d4e3281d..3bfd47d05 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -28,32 +28,33 @@ DEPENDS += "nlohmann-json" DEPENDS += "virtual/${PN}-config-native" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" S = "${WORKDIR}/git" -FILES_${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" +FILES:${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.LED.GroupManager.service" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.LED.GroupManager.service" -SYSTEMD_SERVICE_${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" -SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service" +SYSTEMD_SERVICE:${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service" +SYSTEMD_SERVICE:${PN}-faultmonitor += "obmc-fru-fault-monitor.service" -SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +SYSTEMD_LINK:${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service" +CHASSIS_TARGETS = "poweron poweroff" STATES = "start stop" -TMPLFMT = "obmc-led-group-{0}@.service" -TGTFMT = "obmc-power-{0}@0.target" -INSTFMT = "obmc-led-group-{0}@power_on.service" +TMPLFMT = "obmc-led-group-{1}@.service" +TGTFMT = "obmc-chassis-{0}@0.target" +INSTFMT = "obmc-led-group-{1}@power_on.service" FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'FMT', 'CHASSIS_TARGETS', '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" +SYSTEMD_OVERRIDE:${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" -do_compile_prepend() { +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 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 f1a1112aa..e1f7f259f 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -14,16 +14,16 @@ DEPENDS += "systemd" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "boost" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.led.controller@.service" +DBUS_SERVICE:${PN} += "xyz.openbmc_project.led.controller@.service" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" SRCREV = "5ee5f3b7162cb5d8e6780a9571e0b0ca3daf7c6e" S = "${WORKDIR}/git" -do_install_append() { - install -d ${D}/${base_libdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${base_libdir}/udev/rules.d/ +do_install:append() { + install -d ${D}/${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/70-leds.rules ${D}/${nonarch_base_libdir}/udev/rules.d/ } |