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/classes | |
| 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/classes')
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-mmc.bbclass | 8 | ||||
| -rw-r--r-- | meta-phosphor/classes/phosphor-software-manager-ubi-fs.bbclass | 6 |
2 files changed, 9 insertions, 5 deletions
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 \ |