Convert to new override syntax

This is effectively a manual cherry-pick and squash of commits:

dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f
917a82316bf53ead29d6345a39189d9e4efeef25
20e81c0a9d36660de671dd5ac2e006e31c0e621b

from the master branch with additional review and fixups.

The intent of these changes is to minimize the effort to backport
fixes from the master branch, which has been updated in preparation
for the switch to the next Yocto LTS release in early 2022.

Bug-AGL: SPEC-4144

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I91c1640c6335d7748a2531d2fe8bf86d2d2aee32
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26876
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

8 files changed, 23 insertions, 23 deletions

diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES b/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
index f9cb5b1e4..e4f5e7d9b 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/NOTES
@@ -5,7 +5,7 @@
 
 # E.g. MACHINE_FEATURE. Should *not* be in layer.conf !!
 # Radio packages
-#IMAGE_INSTALL_append_rcar-gen3 += " \
+#IMAGE_INSTALL:append:rcar-gen3 += " \
 #    si-tools \
 #    si-init \
 #    linux-firmware-wl18xx \
@@ -17,19 +17,19 @@
 #    ofono-tests \
 #"
 # E.g. MACHINE_FEATURE
-#IMAGE_INSTALL_append_r8a7797 += " \
+#IMAGE_INSTALL:append:r8a7797 += " \
 #    kernel-module-uio-imp \
 #    kernel-module-cmemdrv \
 #    udev-rules-cvlib \
 #"
 # E.g. MACHINE_FEATURE
-#IMAGE_INSTALL_append_r8a7798 += " \
+#IMAGE_INSTALL:append:r8a7798 += " \
 #    kernel-module-uio-imp \
 #    kernel-module-cmemdrv \
 #    udev-rules-cvlib \
 #"
 # This is a special use case. Should be enabled by user.
-#DISTRO_FEATURES_append = " surroundview "
+#DISTRO_FEATURES:append = " surroundview "
 
 
 #### BBMASK
@@ -58,7 +58,7 @@ BBMASK += "/meta-rcar-gen3-adas/recipes-devtools/valgrind/"
 BBMASK += "/meta-rcar-gen3-adas/recipes-devtools/gcc/"
 
 # libpng in upstream already enabled neon
-# poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb:EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
+# poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb:EXTRA_OECONF:append:class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}"
 BBMASK += "/meta-rcar-gen3-adas/recipes-graphics/libpng/"
 
 # opencv in upstream is newer
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
index 4e0f7dd0d..eb1da3d35 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/conf/include/rcar-gen3-adas.inc
@@ -1,10 +1,10 @@
 #Keep this as a reminder
 #MACHINEOVERRIDES .= ":kingfisher"
-#PACKAGE_EXTRA_ARCHS_append = " kingfisher"
+#PACKAGE_EXTRA_ARCHS:append = " kingfisher"
 
 # Add a feature as a low-impact way to detect Kingfisher support in
 # recipes.
-AGL_FEATURES_append = " kingfisher"
+AGL_FEATURES:append = " kingfisher"
 
 PREFERRED_RPROVIDER_virtual/gpsd-conf ?= "gpsd-kingfisher-conf"
 
@@ -13,7 +13,7 @@ IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}-kf"
 TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-kf-toolchain-${SDK_VERSION}"
 
 # Radio packages
-IMAGE_INSTALL_append_rcar-gen3 += " \
+IMAGE_INSTALL:append:rcar-gen3 += " \
     si-tools \
     si-init \
     linux-firmware-wl18xx \
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb
index 7ab99e025..c752bba08 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-init_1.0.bb
@@ -25,4 +25,4 @@ KERNEL=="i2c-12", MODE="0660", GROUP="audio", SECLABEL{smack}="*"
 EOF
 }
 
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend
index 98c66737b..7121bd168 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/si-tools/si-tools.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/files"
+FILESEXTRAPATHS:append := ":${THISDIR}/files"
 
 SRC_URI += " \
     file://si-tools-fm-improvements.patch \
 "
 
-EXTRA_OEMAKE_append = " 'LDFLAGS=${LDFLAGS}'"
+EXTRA_OEMAKE:append = " 'LDFLAGS=${LDFLAGS}'"
 
 do_install() {
     install -d ${D}${bindir}
@@ -22,7 +22,7 @@ do_install() {
     done
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${bindir} \
     ${nonarch_base_libdir}/firmware/radio \
 "
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend
index e29e54e44..52bee656d 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bbappend
@@ -3,4 +3,4 @@ do_install() {
 	cp *.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
 }
 
-FILES_${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend
index a08cb2624..55d570fc7 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-bsp/ti-bt/ti-bt_%.bbappend
@@ -1,15 +1,15 @@
 inherit systemd
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://ti-uim.service"
 
-SYSTEMD_SERVICE_${PN} = "ti-uim.service"
+SYSTEMD_SERVICE:${PN} = "ti-uim.service"
 
 PR = "r0"
 PV = "0.1+git${SRCPV}"
 
-do_install_append() {
+do_install:append() {
     # We do not want the blacklist
     rm -f ${D}/${sysconfdir}/modprobe.d/ti_bt.conf
 
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
index d6c101443..20682e4f0 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_ulcb = " \
+SRC_URI:append:ulcb = " \
     file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \
 "
 
-KERNEL_DEVICETREE_remove_h3ulcb = " \
+KERNEL_DEVICETREE:remove:h3ulcb = " \
     renesas/r8a7795-es1-h3ulcb-view.dtb \
     renesas/r8a7795-es1-h3ulcb-had-alfa.dtb \
     renesas/r8a7795-es1-h3ulcb-had-beta.dtb \
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb
index 2c4192b98..918e29fc1 100644
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-navigation/gpsd/gpsd-kingfisher-conf_1.0.bb
@@ -8,9 +8,9 @@ SRC_URI = " \
 
 inherit update-alternatives
 
-RPROVIDES_${PN} += "virtual/gpsd-conf"
+RPROVIDES:${PN} += "virtual/gpsd-conf"
 
-ALTERNATIVE_${PN} = "gpsd-defaults"
+ALTERNATIVE:${PN} = "gpsd-defaults"
 ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd"
 ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.kingfisher"
 ALTERNATIVE_PRIORITY[gpsd-defaults] = "20"
@@ -23,5 +23,5 @@ do_install() {
     install -m 0644 ${WORKDIR}/gpsd.kingfisher ${D}/${sysconfdir}/default/gpsd.kingfisher
 }
 
-FILES_${PN} = "${sysconfdir}/default/gpsd.kingfisher"
-CONFFILES_${PN} = "${sysconfdir}/default/gpsd.kingfisher"
+FILES:${PN} = "${sysconfdir}/default/gpsd.kingfisher"
+CONFFILES:${PN} = "${sysconfdir}/default/gpsd.kingfisher"