commit d5c716dc3add128301ec4ba8ebb21bb6eb7856fd
author Patrick Williams <patrick@stwcx.xyz> Thu Feb 17 07:30:57 2022 -0600
committer Patrick Williams <patrick@stwcx.xyz> Fri Feb 18 18:41:12 2022 +0000
tree ec3dcdc3ab942a2beac6b9207f3a8506bfaa34af
parent 18a6b18c34b9c651b96fa3fb5be956aee1604db9

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

meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend

diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
index b52ae49..655a446 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend
@@ -3,8 +3,8 @@
 
 # Remove what installed by common recipe
 OBMC_CONSOLE_HOST_TTY = ""
-SYSTEMD_SUBSTITUTIONS:remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service"
-SYSTEMD_SUBSTITUTIONS:remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
+SYSTEMD_SUBSTITUTIONS:remove = "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service"
+SYSTEMD_SUBSTITUTIONS:remove = "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket"
 SYSTEMD_SERVICE:${PN}:remove = " \
                           ${PN}-ssh.socket \
                           ${PN}-ssh@.service \