From 3f248dc32aa8c8f9c294d955fe0f19d8c8c4579a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 13 Aug 2021 16:20:46 -0400 Subject: led-group: move to action targets While debugging another issue, it was noticed that this service, obmc-led-group-start/stop@power_on.service was installed within a synchronization target. Specifically within the obmc-power-stop@0.target. This target is only meant to be used as a synchronization target, where other services use Wants/After/Before type syntax to synchronize when they run. For installing a service, the standard action targets should be used, obmc-chassis-poweron@.target and obmc-chassis-poweroff@.target. Tested: - Verified services are in correct target and still run during chassis on and power off. Signed-off-by: Andrew Geissler Change-Id: I5fecc8236e20f83fb5636445710621bbc8b46b57 --- meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 7e6072508..b834b6b19 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -41,12 +41,13 @@ 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" +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" -- cgit v1.2.3