diff options
4 files changed, 12 insertions, 7 deletions
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 800109528b..b3bfaa4b2b 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-json use-lamp-test monitor-operational-status" +PACKAGECONFIG:append:p10bmc = " use-lamp-test monitor-operational-status" # Install the lamp test override file for p10bmc SRC_URI:append:p10bmc = " file://lamp-test-led-overrides.json" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index f4021e929c..d4bd011666 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://led-group-config.json" -PACKAGECONFIG:append = " use-json use-lamp-test" +PACKAGECONFIG:append = " use-lamp-test" do_install:append() { install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/ 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 90fd49ec53..c481aa5db1 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -8,8 +8,15 @@ require ${PN}.inc inherit meson pkgconfig python3native inherit obmc-phosphor-dbus-service obmc-phosphor-systemd -PACKAGECONFIG ??= "" -PACKAGECONFIG[use-json] = "-Duse-json=enabled, -Duse-json=disabled" +PACKAGECONFIG ??= "\ + ${@oe.utils.conditional( \ + 'PREFERRED_PROVIDER_virtual/${PN}-config-native', \ + 'phosphor-led-manager-config-example-native', \ + 'use-json', 'use-yaml', d)} \ +" + +PACKAGECONFIG[use-json] = "-Duse-json=enabled,,,,,use-yaml" +PACKAGECONFIG[use-yaml] = "-Duse-json=disabled,,virtual/${PN}-config-native,,,use-json" PACKAGECONFIG[use-lamp-test] = "-Duse-lamp-test=enabled, -Duse-lamp-test=disabled" PACKAGECONFIG[monitor-operational-status] = "-Dmonitor-operational-status=enabled, \ -Dmonitor-operational-status=disabled" @@ -26,8 +33,6 @@ DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "systemd" -DEPENDS += "virtual/${PN}-config-native" - RDEPENDS:${PN} += "bash" S = "${WORKDIR}/git" diff --git a/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index b329b84361..7e0aee5db4 100644 --- a/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-quanta/meta-s6q/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS:prepend:s6q := "${THISDIR}/${PN}:" SRC_URI:append:s6q = " file://led-group-config.json" -PACKAGECONFIG:append:s6q = " use-json use-lamp-test" +PACKAGECONFIG:append:s6q = " use-lamp-test" do_install:append:s6q() { install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/ |