From f3acf6db3a6e527a4c8347643924fbc33c65e237 Mon Sep 17 00:00:00 2001
From: Willy Tu <wltu@google.com>
Date: Tue, 10 Aug 2021 18:14:20 -0700
Subject: meta-quanta: meta-common:  Cleanup for Yocto override syntax change

Cleanup with
```
convert-overrides.py meta-quanta/meta-common
```

After Cleanup
```
$ git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-common/
meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend:do_install:append() {
meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh:        dev_mac="$(set_local_administered_bit $dev_mac_path)"
meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh:        host_mac="$(set_local_administered_bit $host_mac_path)"
meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh:        echo $dev_mac > $dev_mac_path
meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh:        echo $host_mac > $host_mac_path
meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh:    cat $dev_mac_path > functions/ecm.usb0/dev_addr # write device mac address
meta-quanta/meta-common/recipes-quanta/network/usb-network/usb-network.sh:    cat $host_mac_path > functions/ecm.usb0/host_addr # write usb mac address
```

Change-Id: I21ac9c73fbfeb0972f910e30404c704d72095efd
Signed-off-by: Willy Tu <wltu@google.com>
---
 .../health/phosphor-health-monitor_%.bbappend              |  6 +++---
 .../recipes-quanta/fans/read-margin-temp_git.bb            |  4 ++--
 .../meta-common/recipes-quanta/network/mac-address_git.bb  |  4 ++--
 .../meta-common/recipes-quanta/network/usb-network.bb      | 14 +++++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'meta-quanta')

diff --git a/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
index 1d8bb4ecd..81c537120 100755
--- a/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
+++ b/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " file://bmc_health_config.json \
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append = " file://bmc_health_config.json \
                  "
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${sysconfdir}/healthMon/
     install -m 0644 ${WORKDIR}/bmc_health_config.json ${D}/${sysconfdir}/healthMon/
 }
diff --git a/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb b/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb
index 63551ef99..676bdf345 100644
--- a/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb
+++ b/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb
@@ -14,9 +14,9 @@ DEPENDS += " nlohmann-json"
 DEPENDS += " sdbusplus"
 DEPENDS += " sdeventplus"
 DEPENDS += " phosphor-dbus-interfaces"
-RDEPENDS_${PN} += " bash"
+RDEPENDS:${PN} += " bash"
 
-FILES_${PN} = "${bindir}/read-margin-temp"
+FILES:${PN} = "${bindir}/read-margin-temp"
 
 do_install() {
     install -d ${D}${bindir}
diff --git a/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb b/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb
index 5b63e49cb..9bbf43c2c 100644
--- a/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb
+++ b/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb
@@ -11,10 +11,10 @@ SRCREV = "08b87370c56ff69df852eca87391ae46c05d437a"
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "systemd"
 
-FILES_${PN} += "${bindir}/mac-address"
+FILES:${PN} += "${bindir}/mac-address"
 
 SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "mac-address.service"
+SYSTEMD_SERVICE:${PN} = "mac-address.service"
 
 EXTRA_OECONF = " \
     SYSTEMD_TARGET="multi-user.target" \
diff --git a/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb b/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb
index 85146aa1f..41094c05d 100644
--- a/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb
+++ b/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb
@@ -1,17 +1,17 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI_append = " file://usb-network.sh"
-SRC_URI_append = " file://usb-network.service"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"
+SRC_URI:append = " file://usb-network.sh"
+SRC_URI:append = " file://usb-network.service"
 
 inherit systemd
 
 DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
 
-FILES_${PN}_append = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+FILES:${PN}:append = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
 
 do_install() {
     install -d ${D}/${sbindir}
@@ -22,4 +22,4 @@ do_install() {
         ${D}${systemd_unitdir}/system
 }
 
-SYSTEMD_SERVICE_${PN}_append = "usb-network.service"
+SYSTEMD_SERVICE:${PN}:append = "usb-network.service"
-- 
cgit v1.2.3