diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-31 21:19:27 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-31 22:37:01 +0300 |
| commit | ed104d431da1d9283a870919eb987e9c1d3356b1 (patch) | |
| tree | d14cf5e746b48f7fab2f7b49da0cd16a8202a37a /meta-phosphor/recipes-phosphor/leds | |
| parent | 524c03d807dda1fa4fa4a7c652af98fc676820ff (diff) | |
| download | openbmc-ed104d431da1d9283a870919eb987e9c1d3356b1.tar.xz | |
meta-phosphor: switch EXTRA_OEMESON to use override syntax
It was observed that we have different approaches to modifying the
EXTRA_OEMESON variable across our recipes. The bitbake manual
implies that override syntax (":append") is slightly better and the
poky meson bbclass also prefers it:
meta/classes/meson.bbclass:EXTRA_OEMESON:append = " ${PACKAGECONFIG_CONFARGS}"
Switch all recipes to use the ":append" override syntax for the
EXTRA_OEMESON variable.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I24e9a27a87c61f374acfb03a63955821fce0dd20
Diffstat (limited to 'meta-phosphor/recipes-phosphor/leds')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb | 2 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb | 2 |
2 files changed, 2 insertions, 2 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 b834b6b19e..341c5f73ba 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -52,7 +52,7 @@ 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" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" do_compile:prepend() { if [ -f "${LED_YAML_PATH}/led.yaml" ]; then diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb index 684e41c3a2..e1f7f259f4 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-sysfs_git.bb @@ -16,7 +16,7 @@ DEPENDS += "boost" DBUS_SERVICE:${PN} += "xyz.openbmc_project.led.controller@.service" -EXTRA_OEMESON += "-Dtests=disabled" +EXTRA_OEMESON:append = " -Dtests=disabled" SRC_URI += "git://github.com/openbmc/phosphor-led-sysfs" SRC_URI += "file://70-leds.rules" |