meta-quanta: Fix incorrect change in Yocto syntax update

'SYSTEMD_ENVIRONMENT_FILE', 'SYSTEMD_LINK', 'SYSTEMD_OVERRIDE'
should stay underscore

Signed-off-by: David Wang <davidwang@quantatw.com>
Change-Id: Ia30f306857d1552b19ff5ed06664c8bd5360cb4c

4 files changed, 22 insertions, 22 deletions

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 c9a0c38c3..edf81760f 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,25 +8,25 @@ TMPL_PRESENT = "phosphor-gpio-presence@.service"
 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')}"
+SYSTEMD_LINK_${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}"
 
 GBS_PRESENT_ENV_FMT = "obmc/gpio/gpios-{0}.conf"
 
-SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}"
 
 do_install:append:gbs() {
     install -d ${D}${systemd_system_unitdir}
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index b9ea43e1c..f36178d35 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -11,14 +11,14 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}"
 EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}"
 
 ENVFMT = "obmc/eeproms/{0}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}"
 
 TMPL = "obmc-read-eeprom@.service"
 TGT = "multi-user.target"
 INSTFMT = "obmc-read-eeprom@{0}.service"
 FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}"
 
-SYSTEMD_LINK:${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
+SYSTEMD_LINK_${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}"
 
 EXTRA_OECONF:append:gbs = " \
     YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \
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 723ac418d..657684d7a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -22,12 +22,12 @@ GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}"
 GBS_ITEMS:append:gbs += " iio-hwmon-battery.conf"
 
 ENVS = "obmc/hwmon/{0}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}"
 
 # Fan sensors
 FITEMS = "pwm-fan-controller@103000.conf"
 FENVS = "obmc/hwmon/ahb/apb/{0}"
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}"
 
 
 EXTRA_OEMESON:append:gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
index 7ad4e2521..23b063fc3 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend
@@ -1,11 +1,11 @@
 FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:"
 
-SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " obmc/watchdog/host0"
+SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gbs = " obmc/watchdog/host0"
 OBMC_HOST_WATCHDOG_INSTANCES_A = "host0"
 WATCHDOG_FMT_A = "phosphor-watchdog@{0}.service"
-SYSTEMD_OVERRIDE:${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
-SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}"
-SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_OVERRIDE_${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf"
+SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}"
+SYSTEMD_LINK_${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}"
 SYSTEMD_SERVICE:${PN}:gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \
                               phosphor-host-watchdog-reset.service \
                               phosphor-host-watchdog-poweroff.service \