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

4 files changed, 21 insertions, 21 deletions

diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 4956dd78d1..82705c4924 100644
--- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,11 +1,11 @@
 ALT_RMCPP_IFACE:mihawk = "eth1"
-SYSTEMD_SERVICE:${PN}:append:mihawk += " \
+SYSTEMD_SERVICE:${PN}:append:mihawk = " \
     ${PN}@${ALT_RMCPP_IFACE}.service \
     ${PN}@${ALT_RMCPP_IFACE}.socket \
     "
 
 ALT_RMCPP_IFACE:p10bmc = "eth1"
-SYSTEMD_SERVICE:${PN}:append:p10bmc += " \
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " \
     ${PN}@${ALT_RMCPP_IFACE}.service \
     ${PN}@${ALT_RMCPP_IFACE}.socket \
     "
diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index f734bf530b..800109528b 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,9 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE:${PN}:append:p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
+SYSTEMD_SERVICE:${PN}:append:p10bmc = " obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service"
 
 # Copies config file having arguments for led-set-all-groups-asserted.sh
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc +="obmc/led/set-all/groups/config"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc =" obmc/led/set-all/groups/config"
 
 # Use the JSON configuration file at runtime than the static led.yaml
 # Also, enable Lamp Test and OperationalStatus monitor feature for
diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
index 17d25a11ab..245ab999e4 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -21,4 +21,4 @@ do_install:append(){
 FILES:${PN} += "${datadir}/phosphor-power/psu.json"
 
 PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 83f87b1ae5..577e200289 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -81,22 +81,22 @@ CHIPS:p10bmc = " \
 
 ITEMSFMT = "ahb/apb/{0}.conf"
 ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
-ITEMS:append:mihawk += " iio-hwmon-vdd0.conf"
-ITEMS:append:mihawk += " iio-hwmon-vdd1.conf"
-ITEMS:append:mihawk += " iio-hwmon-vcs0.conf"
-ITEMS:append:mihawk += " iio-hwmon-vcs1.conf"
-ITEMS:append:mihawk += " iio-hwmon-vdn0.conf"
-ITEMS:append:mihawk += " iio-hwmon-vdn1.conf"
-ITEMS:append:mihawk += " iio-hwmon-vio0.conf"
-ITEMS:append:mihawk += " iio-hwmon-vio1.conf"
-ITEMS:append:mihawk += " iio-hwmon-vddra.conf"
-ITEMS:append:mihawk += " iio-hwmon-vddrb.conf"
-ITEMS:append:mihawk += " iio-hwmon-vddrc.conf"
-ITEMS:append:mihawk += " iio-hwmon-vddrd.conf"
-ITEMS:append:mihawk += " iio-hwmon-12v.conf"
-ITEMS:append:mihawk += " iio-hwmon-5v.conf"
-ITEMS:append:mihawk += " iio-hwmon-3v.conf"
-ITEMS:append:mihawk += " iio-hwmon-battery.conf"
+ITEMS:append:mihawk = " iio-hwmon-vdd0.conf"
+ITEMS:append:mihawk = " iio-hwmon-vdd1.conf"
+ITEMS:append:mihawk = " iio-hwmon-vcs0.conf"
+ITEMS:append:mihawk = " iio-hwmon-vcs1.conf"
+ITEMS:append:mihawk = " iio-hwmon-vdn0.conf"
+ITEMS:append:mihawk = " iio-hwmon-vdn1.conf"
+ITEMS:append:mihawk = " iio-hwmon-vio0.conf"
+ITEMS:append:mihawk = " iio-hwmon-vio1.conf"
+ITEMS:append:mihawk = " iio-hwmon-vddra.conf"
+ITEMS:append:mihawk = " iio-hwmon-vddrb.conf"
+ITEMS:append:mihawk = " iio-hwmon-vddrc.conf"
+ITEMS:append:mihawk = " iio-hwmon-vddrd.conf"
+ITEMS:append:mihawk = " iio-hwmon-12v.conf"
+ITEMS:append:mihawk = " iio-hwmon-5v.conf"
+ITEMS:append:mihawk = " iio-hwmon-3v.conf"
+ITEMS:append:mihawk = " iio-hwmon-battery.conf"
 
 OCCS = " \
         00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \