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
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 \
diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
index 0d1b5e6..40710a3 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append += " \
+SRC_URI:append = " \
                    file://virtual_sensor_config.json \
                   "
 
diff --git a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
index 97ea50d..0e4429e 100644
--- a/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
+++ b/meta-facebook/recipes-phosphor/datetime/phosphor-time-manager_%.bbappend
@@ -1,9 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:fb-withhost += "file://set-bmc-time-from-host"
+SRC_URI:append:fb-withhost = " file://set-bmc-time-from-host"
 
 
-RDEPENDS:${PN}:append:fb-withhost += "bash"
+RDEPENDS:${PN}:append:fb-withhost = " bash"
 
 do_install:append:fb-withhost(){
 
diff --git a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
index 8ae2e60..3ee26b1 100644
--- a/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
+++ b/meta-facebook/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend
@@ -2,9 +2,9 @@
 
 SRC_URI += "file://ttyS2.conf"
 
-SRC_URI:append:yosemitev2 += "file://ttyS0.conf"
-SRC_URI:append:yosemitev2 += "file://ttyS1.conf"
-SRC_URI:append:yosemitev2 += "file://ttyS3.conf"
+SRC_URI:append:yosemitev2 = " file://ttyS0.conf"
+SRC_URI:append:yosemitev2 = " file://ttyS1.conf"
+SRC_URI:append:yosemitev2 = " file://ttyS3.conf"
 
 do_install:append() {
 
diff --git a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
index 5668840..e28dded 100644
--- a/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
+++ b/meta-fii/meta-kudo/recipes-kudo/network/usb-network.bb
@@ -7,7 +7,7 @@
 RDEPENDS:${PN} += "libsystemd"
 RDEPENDS:${PN} += "bash"
 
-SRC_URI:append += " \
+SRC_URI:append = " \
     file://usb_network.sh \
     file://usb_network.service \
     file://00-bmc-usb0.network \
diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index 4956dd7..82705c4 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 f734bf5..8001095 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 17d25a1..245ab99 100644
--- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
+++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend
@@ -21,4 +21,4 @@
 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 83f87b1..577e200 100644
--- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -81,22 +81,22 @@
 
 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 \
diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index ce9c697..9cfccae 100644
--- a/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ingrasys/meta-zaius/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -7,5 +7,5 @@
 TGT = "multi-user.target"
 FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}"
 
-SYSTEMD_LINK:${PN}-presence:append:zaius += "${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:zaius += "obmc/gpio/phosphor-pcie-card-e2b.conf"
+SYSTEMD_LINK:${PN}-presence:append:zaius = " ${@compose_list(d, 'FMT', 'PCIE_CARD_E2B_INSTANCE')}"
+SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:zaius = " obmc/gpio/phosphor-pcie-card-e2b.conf"
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 73a788c..91fded1 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 @@
        "
 
 #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 405f9a5..713c44b 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}/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 39a681e..9d07944 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 @@
 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"
diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
index 804084e..c39c077 100644
--- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
+++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb
@@ -77,7 +77,7 @@
         sdbusplus \
         virtual/${PN}-config-native \
         "
-RDEPENDS:${PN}:remove:class-native += "phosphor-state-manager-obmc-targets"
+RDEPENDS:${PN}:remove:class-native = "phosphor-state-manager-obmc-targets"
 
 # Remove packages not required for native SDK build
 DEPENDS:remove:class-nativesdk = " \
@@ -86,7 +86,7 @@
         sdbusplus \
         virtual/${PN}-config-native \
         "
-RDEPENDS:${PN}:remove:class-nativesdk += "phosphor-state-manager-obmc-targets"
+RDEPENDS:${PN}:remove:class-nativesdk = "phosphor-state-manager-obmc-targets"
 
 # Provide a means to enable/disable install_error_yaml feature
 PACKAGECONFIG ??= "install_error_yaml"
diff --git a/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend b/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
index 0921a80..f369f7a 100644
--- a/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append += "file://BootBlockAndHeader_GBS.xml"
-SRC_URI:append += "file://UbootHeader_GBS.xml"
+SRC_URI:append = " file://BootBlockAndHeader_GBS.xml"
+SRC_URI:append = " file://UbootHeader_GBS.xml"
 
 # Prepare the Bootblock XMLs.
 do_gbs_prepare_xmls() {
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index c9a0c38..ab5eea7 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -8,18 +8,18 @@
 INSTFMT_PRESENT = "phosphor-gpio-presence@{0}.service"
 PRESENT_TGT = "multi-user.target"
 FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-0.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-1.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-2.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-3.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-4.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-5.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-6.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-7.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-8.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-9.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-10.conf"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-11.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-0.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-1.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-2.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-3.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-4.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-5.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-6.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-7.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-8.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-9.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-10.conf"
+SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs =" obmc/gpio/gpios-11.conf"
 GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10 11"
 
 SYSTEMD_LINK:${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
index 723ac41..71367c9 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -19,7 +19,7 @@
 GBS_ITEMSFMT = "ahb/apb/{0}.conf"
 
 GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}"
-GBS_ITEMS:append:gbs += " iio-hwmon-battery.conf"
+GBS_ITEMS:append:gbs = " iio-hwmon-battery.conf"
 
 ENVS = "obmc/hwmon/{0}"
 SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}"