From ed104d431da1d9283a870919eb987e9c1d3356b1 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 31 Aug 2021 13:19:27 -0500 Subject: 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 Change-Id: I24e9a27a87c61f374acfb03a63955821fce0dd20 --- meta-phosphor/classes/phosphor-software-manager-mmc.bbclass | 8 +++++--- meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'meta-phosphor/classes') diff --git a/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass index 479619c34..0590a835e 100644 --- a/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-mmc.bbclass @@ -2,9 +2,11 @@ PACKAGECONFIG:append = " mmc_layout" -EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2" -EXTRA_OEMESON += "-Dmedia-dir='/media'" -EXTRA_OEMESON += "-Doptional-images='image-hostfw'" +EXTRA_OEMESON:append = " \ + -Dactive-bmc-max-allowed=2 \ + -Dmedia-dir='/media' \ + -Doptional-images='image-hostfw' \ +" RDEPENDS:phosphor-software-manager-updater-mmc += " \ gptfdisk \ diff --git a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass index 71f8c6f76..9d38adaf7 100644 --- a/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass +++ b/meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass @@ -7,8 +7,10 @@ RDEPENDS:phosphor-software-manager-updater-ubi += " \ " # Add ubi-fs configs -EXTRA_OEMESON += "-Dactive-bmc-max-allowed=2" -EXTRA_OEMESON += "-Dmedia-dir='/media'" +EXTRA_OEMESON:append = " \ + -Dactive-bmc-max-allowed=2 \ + -Dmedia-dir='/media' \ +" SYSTEMD_SERVICE:phosphor-software-manager-updater-ubi += " \ obmc-flash-bmc-ubirw.service \ -- cgit v1.2.3