From c5fd20a105916a2b6888dc16d770a15d117fa8c2 Mon Sep 17 00:00:00 2001 From: Vishwanatha Subbanna Date: Fri, 26 Mar 2021 06:11:29 -0500 Subject: ledmanager: Remove phosphor-led-manager-ledmanager package phosphor-led-manager has 3 packages - phosphor-led-manager : Default - phosphor-led-manager-ledmanager : Packages phosphor-ledmanager - phosphor-ledmanager-faultmonitor : Packages phosphor-fru-fault-monitor Because of this, it was not possible to install files via Makefile and that always needed a corresponding update to FILES_{PN}-ledmanager. Removing phosphor-led-manager-ledmanager will eliminate this problem. Change-Id: I00ca4c34346a47f887872464b9050a46d8f5e8e9 Signed-off-by: Vishwanatha Subbanna --- meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index ba146bcb6..174d9d0a4 100644 --- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -1,15 +1,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SYSTEMD_SERVICE_${PN}-ledmanager_append_rainier += "obmc-led-set-all-groups-asserted@.service" +SYSTEMD_SERVICE_${PN}_append_rainier += "obmc-led-set-all-groups-asserted@.service" # Copies config file having arguments for led-set-all-groups-asserted.sh -SYSTEMD_ENVIRONMENT_FILE_${PN}-ledmanager_append_rainier +="obmc/led/set-all/groups/config" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_rainier +="obmc/led/set-all/groups/config" # Use the JSON configuration file at runtime than the static led.yaml # Also, enable Lamp Test feature for rainier systems PACKAGECONFIG_append_rainier = " use-json use-lamp-test" -pkg_postinst_${PN}-ledmanager_rainier () { +pkg_postinst_${PN}_rainier () { # Needed this to run as part of BMC boot mkdir -p $D$systemd_system_unitdir/multi-user.target.wants @@ -24,7 +24,7 @@ pkg_postinst_${PN}-ledmanager_rainier () { ln -s $TARGET $LINK } -pkg_prerm_${PN}-ledmanager_rainier () { +pkg_prerm_${PN}_rainier () { LINK="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-set-all-groups-asserted@false.service" rm $LINK -- cgit v1.2.3