commit 6e77b406bfcc73753a1c35a80f552a05d29b0656
author Adriana Kobylak <anoo@us.ibm.com> Thu Mar 25 16:44:27 2021 +0000
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu Apr 08 16:38:43 2021 +0000
tree 8b88c281263fd2b4a63edddb5c7a23862e565bc7
parent a433d8ef9fc03b653a770634624ac2ae084cf0b0

ibm: led-manager: Replace rainier with p10bmc

The IBM rainier machine name is being replaced with the generic p10bmc.

Tested: Verified the rainier build included the expected service files
and LED override file, example:
- rainier-openbmc-linux-gnueabi/obmc-phosphor-image/1.0-r0/rootfs/usr/share/phosphor-led-manager/lamp-test-led-overrides.json

Change-Id: I8f9ecbc6ebe1d320a649b24bf71c5023cfc035c8
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend

diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index a41f12a..0ae5474 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,18 +1,18 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE_${PN}_append_rainier += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
+SYSTEMD_SERVICE_${PN}_append_p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
 
 # Copies config file having arguments for led-set-all-groups-asserted.sh
-SYSTEMD_ENVIRONMENT_FILE_${PN}_append_rainier +="obmc/led/set-all/groups/config"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_p10bmc +="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"
+# Also, enable Lamp Test feature for p10bmc systems
+PACKAGECONFIG_append_p10bmc = " use-json use-lamp-test"
 
-# Install the lamp test override file for rainier
-SRC_URI_append_rainier = " file://lamp-test-led-overrides.json"
+# Install the lamp test override file for p10bmc
+SRC_URI_append_p10bmc = " file://lamp-test-led-overrides.json"
 
-pkg_postinst_${PN}_rainier () {
+pkg_postinst_${PN}_p10bmc () {
 
     # Needed this to run as part of BMC boot
     mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
@@ -39,7 +39,7 @@
     ln -s $TARGET_ID $LINK_ID
 }
 
-pkg_prerm_${PN}_rainier () {
+pkg_prerm_${PN}_p10bmc () {
 
     LINK="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-set-all-groups-asserted@false.service"
     rm $LINK
@@ -55,7 +55,7 @@
 }
 
 # Install lamp test override json
-do_install_append_rainier() {
+do_install_append_p10bmc() {
     install -d ${D}${datadir}/${BPN}/
     install -m 0644 ${WORKDIR}/lamp-test-led-overrides.json ${D}${datadir}/${BPN}/
 }