diff options
11 files changed, 85 insertions, 20 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf index c0c5bfb0b..1fedc69aa 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/conf/machine/palmetto.conf @@ -16,3 +16,4 @@ PHOSPHOR_MRW_REV = "82818682f2c2009c30d700df6d5f8897a3096e4f" PREFERRED_PROVIDER_virtual/obmc-inventory-data = "obmc-inventory" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "palmetto-ipmi-inventory-map-native" +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "palmetto-led-manager-config-native" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb new file mode 100644 index 000000000..0a4d56197 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb @@ -0,0 +1,18 @@ +SUMMARY = "Phosphor LED Group Management for Palmetto" +PR = "r1" + +inherit native +inherit obmc-phosphor-utils +inherit obmc-phosphor-license + +PROVIDES += "virtual/phosphor-led-manager-config-native" + +SRC_URI += "file://led.yaml" +S = "${WORKDIR}" + +# Copies example led layout yaml file +do_install() { + SRC=${S} + DEST=${D}${datadir}/phosphor-led-manager + install -D ${SRC}/led.yaml ${DEST}/led.yaml +} diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml new file mode 100755 index 000000000..c15439134 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config/led.yaml @@ -0,0 +1,30 @@ +Power: + power: + Action: 'On' + DutyOn: 50 + Period: 0 +HeartBeat: + heartbeat: + Action: 'On' + DutyOn: 50 + Period: 0 +BmcBoot: + identify: + Action: 'On' + DutyOn: 50 + Period: 0 +EnclosureIdentify: + identify: + Action: 'Blink' + DutyOn: 50 + Period: 1000 +PowerBlinkTest: + power: + Action: 'Blink' + DutyOn: 50 + Period: 1000 +HeartBeatBlinkTest: + heartbeat: + Action: 'Blink' + DutyOn: 50 + Period: 1000 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 new file mode 100644 index 000000000..2233e1c7d --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/phosphor-led-manager%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:${SYSTEMD_DEFAULT_TARGET}.wants/obmc-led-group-start@BmcBoot.service" diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb index 8b3703d98..139b775e7 100644 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb +++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb @@ -5,6 +5,8 @@ inherit native inherit obmc-phosphor-utils require phosphor-led-manager.inc +PROVIDES += "virtual/phosphor-led-manager-config-native" + S = "${WORKDIR}/git" # Copies example led layout yaml file diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb index b88dedcd9..fb3259b4a 100644 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb +++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-mrw-native.bb @@ -5,6 +5,7 @@ inherit native inherit obmc-phosphor-utils inherit obmc-phosphor-license +PROVIDES += "virtual/phosphor-led-manager-config-native" DEPENDS += "mrw-native mrw-perl-tools-native" # Generate a YAML files based on MRW input diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-native.bb deleted file mode 100644 index 73812eab5..000000000 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Phosphor LED Group Management meta data" -PR = "r1" - -inherit obmc-phosphor-utils -inherit obmc-phosphor-license -inherit native - -# Default is the example set of data. -PHOSPHOR_LED_MANAGER_CONFIG ??= "${BPN}-example-native" - -# Choose appropriate yaml file -def get_depends(d): - if d.getVar('USE_MRW', 'yes'): - return "${BPN}-mrw-native" - else: - return "${PHOSPHOR_LED_MANAGER_CONFIG}" - -USE_MRW = "${@cf_enabled(d, 'obmc-mrw', 'yes')}" -DEPENDS += "${@get_depends(d)}" 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 54996f999..17871895b 100644 --- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager.bb @@ -9,11 +9,12 @@ require ${PN}.inc DEPENDS += "python-pyyaml-native" DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus sdbusplus-native" -DEPENDS += "${PN}-config-native" +DEPENDS += "virtual/${PN}-config-native" RDEPENDS_${PN} += "libsystemd" 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" EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}" diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service new file mode 100644 index 000000000..7c0207c0d --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-start@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Assert %i LED +Wants=mapper-wait@-xyz-openbmc_project-led-groups-%i.service +After=mapper-wait@-xyz-openbmc_project-led-groups-%i.service + +[Service] +Type=oneshot +RemainAfterExit=yes +Restart=no +ExecStart={sbindir}/mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b true diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service new file mode 100644 index 000000000..4ddf0f8e2 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager/obmc-led-group-stop@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Assert %i LED +Wants=mapper-wait@-xyz-openbmc_project-led-groups-%i.service +After=mapper-wait@-xyz-openbmc_project-led-groups-%i.service + +[Service] +Type=oneshot +RemainAfterExit=yes +Restart=no +ExecStart={sbindir}/mapper call /xyz/openbmc_project/led/groups/%i org.freedesktop.DBus.Properties Set ssv xyz.openbmc_project.Led.Group Asserted b false diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 28e04ef3a..0577085a6 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -80,5 +80,13 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory ?= \ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-properties ?= \ "${@cf_enabled(d, 'obmc-mrw', 'phosphor-ipmi-fru-properties-mrw-native', 'phosphor-ipmi-fru-properties-example-native')}" +# The phosphor-led-manager application is data-driven and requires an input +# yaml of LED group and members. +# This virtual is a native recipe that provides that mapping by installing +# configuration files in the format and native sysroot location expected by +# the phosphor-led-manager build process in the native sysroot. +PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native ?= \ + "${@cf_enabled(d, 'obmc-mrw', 'phosphor-led-manager-config-mrw-native', 'phosphor-led-manager-config-example-native')}" + OBMC_DBUS_PATH_ROOT ?= "/xyz/openbmc_project" OBMC_DBUS_IFACE_ROOT ?= "xyz.openbmc_project" |
