summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Liu <liuxiwei@inspur.com>2023-11-03 11:29:55 +0300
committerGeorge Liu <liuxiwei@ieisystem.com>2023-11-07 03:20:31 +0300
commitfe21f1a7ff7385e8d20f90cf152b298d66dbfba3 (patch)
treeb1d456334925fc4f3a5be91632d167cda47e03fd
parent5fdaadeae7f7292fd377893abeaef36f891e2468 (diff)
downloadopenbmc-fe21f1a7ff7385e8d20f90cf152b298d66dbfba3.tar.xz
ledmanager: Disable persistent-led-asserted by default
Since not all systems start persistent-led-asserted by default, persistent-led-asserted should be disabled by default in Yocto. However, IBM’s p10 machine needs to be enabled by default. Signed-off-by: George Liu <liuxiwei@inspur.com> Change-Id: I9b5302f541bf814f96d5af7d20662b5bfcc4e6a8
-rw-r--r--meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend2
-rw-r--r--meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index b3bfaa4b2b..b36adcae5a 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -8,7 +8,7 @@ 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 and OperationalStatus monitor feature for
# p10bmc systems
-PACKAGECONFIG:append:p10bmc = " use-lamp-test monitor-operational-status"
+PACKAGECONFIG:append:p10bmc = " use-lamp-test monitor-operational-status persistent-led-asserted"
# Install the lamp test override file for p10bmc
SRC_URI:append:p10bmc = " file://lamp-test-led-overrides.json"
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 e32711ef79..40f6af456a 100644
--- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
@@ -19,6 +19,8 @@ PACKAGECONFIG[use-yaml] = "-Duse-json=disabled,,virtual/${PN}-config-native,,,us
PACKAGECONFIG[use-lamp-test] = "-Duse-lamp-test=enabled, -Duse-lamp-test=disabled"
PACKAGECONFIG[monitor-operational-status] = "-Dmonitor-operational-status=enabled, \
-Dmonitor-operational-status=disabled"
+PACKAGECONFIG[persistent-led-asserted] = "-Dpersistent-led-asserted=enabled, \
+ -Dpersistent-led-asserted=disabled"
PV = "1.0+git${SRCPV}"
PR = "r1"