diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-02-17 16:30:57 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-02-18 21:41:12 +0300 |
| commit | d5c716dc3add128301ec4ba8ebb21bb6eb7856fd (patch) | |
| tree | ec3dcdc3ab942a2beac6b9207f3a8506bfaa34af /meta-inventec | |
| parent | 18a6b18c34b9c651b96fa3fb5be956aee1604db9 (diff) | |
| download | openbmc-d5c716dc3add128301ec4ba8ebb21bb6eb7856fd.tar.xz | |
treewide: fix append/remove directives
As mentioned by I970e06ca6f9d0a9792af122eb25da1bb9a06f058, append and
remove directives with '+=' are no longer valid Yocto syntax and raise a
warning.
See https://git.yoctoproject.org/poky/tree/documentation/migration-guides/migration-3.5.rst#n40
One interesting caveat has to do with the difference between "append"
and "+=".
foo:append = "a"
foo:append = "b"
Results in `foo = "ab"`, but
foo += "a"
foo += "b"
Results in `foo = "a b"`. When `:append +=` is used it has behavior
like the `+=` operator. Therefore, in some cases we need to insert
additional whitespace after the `:append = "` to ensure concatenation
behaves as expected. I've manually reviewed the results to ensure there
is no ill side-effects from an additional space potentially being added.
Fix up the entire tree with the following one-liner (and similar for
`remove`):
git ls-files -- ':!:poky/**' ':!:meta-security/**' \
':!:meta-raspberrypi/**' ':!:meta-openembedded/**' \
| grep "\.bb" | xargs grep -l ":append.*+=" \
| xargs sed -i 's/:append\(.*\)+=\([^"]*\)" */:append\1=\2" /'
or ...
| xargs grep -l ":remove.*+=" \
| xargs sed -i "s/:remove\(.*\)+=/:remove\1=/"
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iea6235e7c76e252f4d473652957c2925f6b8845a
Diffstat (limited to 'meta-inventec')
3 files changed, 10 insertions, 10 deletions
diff --git a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-obmc-apps.bbappend index 73a788c030..91fded1f1b 100644 --- a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-obmc-apps.bbappend @@ -4,8 +4,8 @@ RDEPENDS:${PN}-extras:remove = " \ " #Add python utility.(e.g gpioutil,...) -RDEPENDS:${PN}-extrasdevtools:append += " ipmitool" -RDEPENDS:${PN}-extrasdevtools:append += " openssh-sftp-server" +RDEPENDS:${PN}-extrasdevtools:append = " ipmitool" +RDEPENDS:${PN}-extrasdevtools:append = " openssh-sftp-server" RDEPENDS:${PN}-extras += " python3-smbus" #Install publickey for image file verification diff --git a/meta-inventec/meta-transformers/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-inventec/meta-transformers/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend index 405f9a5148..713c44b618 100644 --- a/meta-inventec/meta-transformers/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend +++ b/meta-inventec/meta-transformers/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:append := "${THISDIR}/${BPN}:" FILESEXTRAPATHS:append := "${THISDIR}/u-boot-aspeed-sdk:" -SRC_URI:append += "file://fw_env.config \ +SRC_URI:append = " file://fw_env.config \ file://transformers-ast2600.cfg \ " diff --git a/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend index 39a681ea2c..9d07944a50 100644 --- a/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend +++ b/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend @@ -4,10 +4,10 @@ EXTRA_USERS_PARAMS:append = " \ useradd -e '' -ou 0 -d /home/root -G priv-admin,root,sudo,ipmi,web,redfish -p 'gzW59equAcJAg' sysadmin; \ useradd -e '' -ou 0 -d /home/root -G priv-admin,root,sudo,ipmi,web,redfish -p 'kFdHdjRkot8KQ' admin; \ " -OBMC_IMAGE_EXTRA_INSTALL:append += " openssh-sftp-server" -OBMC_IMAGE_EXTRA_INSTALL:append += " phosphor-ipmi-ipmb" -OBMC_IMAGE_EXTRA_INSTALL:append += " python3-smbus" -OBMC_IMAGE_EXTRA_INSTALL:append += " ipmitool" -#BMC_IMAGE_EXTRA_INSTALL:append += " rest-dbus" -OBMC_IMAGE_EXTRA_INSTALL:append += " mmc-utils" -OBMC_IMAGE_EXTRA_INSTALL:append += " transformers-init" +OBMC_IMAGE_EXTRA_INSTALL:append = " openssh-sftp-server" +OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-ipmb" +OBMC_IMAGE_EXTRA_INSTALL:append = " python3-smbus" +OBMC_IMAGE_EXTRA_INSTALL:append = " ipmitool" +#BMC_IMAGE_EXTRA_INSTALL:append = " rest-dbus" +OBMC_IMAGE_EXTRA_INSTALL:append = " mmc-utils" +OBMC_IMAGE_EXTRA_INSTALL:append = " transformers-init" |