Convert to new override syntaxlamprey_12.1.2lamprey_12.1.1lamprey_12.1.0lamprey/12.1.2lamprey/12.1.1lamprey/12.1.012.1.212.1.112.1.0

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

4249268041b879b3d2bae338d5de88f4f2d54b26
07f4ab8c2833ae5377b97cc9e3820bed67e539d0

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: I3b47f1b7d62038b314a17763d24a64f6d4e15e72

24 files changed, 33 insertions, 33 deletions

diff --git a/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb b/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb
index bc53051f2..4ff82fee1 100644
--- a/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb
+++ b/recipes-apis/agl-service-bluetooth-map/agl-service-bluetooth-map_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 json-c"
-RDEPENDS_${PN} = "bluez5-obex agl-service-bluetooth"
+RDEPENDS:${PN} = "bluez5-obex agl-service-bluetooth"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb b/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb
index 3f9ff7be1..7b5e7e429 100644
--- a/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb
+++ b/recipes-apis/agl-service-bluetooth-pbap/agl-service-bluetooth-pbap_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 json-c"
-RDEPENDS_${PN} = "bluez5-obex agl-service-bluetooth agl-service-data-persistence"
+RDEPENDS:${PN} = "bluez5-obex agl-service-bluetooth agl-service-data-persistence"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb b/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb
index 8cfa8ec8f..76f5ffa39 100644
--- a/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb
+++ b/recipes-apis/agl-service-bluetooth/agl-service-bluetooth_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 json-c"
-RDEPENDS_${PN} = "agl-service-data-persistence agl-service-network"
+RDEPENDS:${PN} = "agl-service-data-persistence agl-service-network"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb b/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb
index 7cc58dd7c..81788646c 100644
--- a/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb
+++ b/recipes-apis/agl-service-can-high-level-viwi/agl-service-can-high-level-viwi.bb
@@ -12,7 +12,7 @@ PV = "4.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 # Run-time dependencies
-RDEPENDS_${PN} += "agl-service-can-low-level"
+RDEPENDS:${PN} += "agl-service-can-low-level"
 
 inherit cmake aglwgt
 
diff --git a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb b/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
index 83f6c1e75..6ac2f4f29 100644
--- a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
+++ b/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bb
@@ -18,6 +18,6 @@ inherit cmake aglwgt pkgconfig ptest
 
 # For now, just enable J1939 on the qemu platforms where we know the
 # linux-yocto kernel is new enough (>= 5.4) and has the support enabled.
-AGLWGT_CMAKE_CONFIGURE_ARGS_append_qemuall = " -DWITH_FEATURE_J1939=ON"
+AGLWGT_CMAKE_CONFIGURE_ARGS:append:qemuall = " -DWITH_FEATURE_J1939=ON"
 
-RDEPENDS_${PN} = "virtual/low-can-dev-mapping"
+RDEPENDS:${PN} = "virtual/low-can-dev-mapping"
diff --git a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend b/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend
index cc198c1cf..bc2d0d357 100644
--- a/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend
+++ b/recipes-apis/agl-service-can-low-level/agl-service-can-low-level_git.bbappend
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI_append = " file://can-dev-mapping-helper.conf"
+SRC_URI:append = " file://can-dev-mapping-helper.conf"
 
-do_install_append() {
+do_install:append() {
     install -D -m 0644 ${WORKDIR}/can-dev-mapping-helper.conf \
         ${D}${sysconfdir}/systemd/system/afm-service-agl-service-can-low-level-.service.d/can-dev-mapping-helper.conf
 }
 
-RDEPENDS_${PN}_append = " can-dev-mapping-helper"
+RDEPENDS:${PN}:append = " can-dev-mapping-helper"
diff --git a/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb b/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb
index 37793fd6f..cc50bfe2a 100644
--- a/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb
+++ b/recipes-apis/agl-service-can-low-level/can-dev-mapping-helper_1.0.bb
@@ -16,6 +16,6 @@ do_install() {
     install -D -m 0755 ${WORKDIR}/${BPN}.sh ${D}${sbindir}/${BPN}.sh
 }
 
-FILES_${PN} += "${systemd_system_unitdir}"
+FILES:${PN} += "${systemd_system_unitdir}"
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
diff --git a/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb b/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb
index 03e6a0eb5..7281a59f0 100644
--- a/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb
+++ b/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb
@@ -16,8 +16,8 @@ DEPENDS = "azure-iot-sdk-c aws-iot-device-sdk-embedded-c glib-2.0 nlohmann-json"
 inherit cmake aglwgt pkgconfig
 
 # Azure include files
-CXXFLAGS_prepend += "-I${STAGING_INCDIR}/azureiot"
+CXXFLAGS:prepend += "-I${STAGING_INCDIR}/azureiot"
 
-RDEPENDS_${PN} += "azure-iot-sdk-c azure-c-shared-utility aws-iot-device-sdk-embedded-c"
+RDEPENDS:${PN} += "azure-iot-sdk-c azure-c-shared-utility aws-iot-device-sdk-embedded-c"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb b/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb
index 8bdcd7c93..05f7f0eaa 100644
--- a/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb
+++ b/recipes-apis/agl-service-geofence/agl-service-geofence_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "json-c glib-2.0"
-RDEPENDS_${PN} = "agl-service-gps"
+RDEPENDS:${PN} = "agl-service-gps"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-gps/agl-service-gps_git.bb b/recipes-apis/agl-service-gps/agl-service-gps_git.bb
index 254e5e409..dfa7b3ebf 100644
--- a/recipes-apis/agl-service-gps/agl-service-gps_git.bb
+++ b/recipes-apis/agl-service-gps/agl-service-gps_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "json-c gpsd"
-RDEPENDS_${PN} = "libgps"
+RDEPENDS:${PN} = "libgps"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb b/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb
index e4dccbf3d..4078c6107 100644
--- a/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb
+++ b/recipes-apis/agl-service-hvac/agl-service-hvac-conf_git.bb
@@ -21,7 +21,7 @@ do_install () {
     install -D -m 644 ${S}/hvac.json ${D}${sysconfdir}/hvac.json
 }
 
-do_install_append_ulcb() {
+do_install:append:ulcb() {
     sed -i -e "s#vcan0#sllin0#g" ${D}${sysconfdir}/hvac.json
 }
 
diff --git a/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb b/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb
index 545ab6a28..8d1399c60 100644
--- a/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb
+++ b/recipes-apis/agl-service-hvac/agl-service-hvac_git.bb
@@ -16,5 +16,5 @@ DEPENDS = "json-c"
 
 inherit cmake aglwgt pkgconfig
 
-RDEPENDS_${PN} += "agl-service-identity-agent agl-service-can-low-level"
-RRECOMMENDS_${PN} += "agl-service-hvac-conf"
+RDEPENDS:${PN} += "agl-service-identity-agent agl-service-can-low-level"
+RRECOMMENDS:${PN} += "agl-service-hvac-conf"
diff --git a/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb b/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb
index cc893698c..600f9103a 100644
--- a/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb
+++ b/recipes-apis/agl-service-iiodevices/agl-service-iiodevices_git.bb
@@ -14,6 +14,6 @@ S  = "${WORKDIR}/git"
 
 DEPENDS = "json-c libiio glib-2.0"
 
-RDEPENDS_${PN} = "libiio"
+RDEPENDS:${PN} = "libiio"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb b/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
index 4f1757c7d..c7d695f25 100644
--- a/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
+++ b/recipes-apis/agl-service-mediaplayer/agl-service-mediaplayer_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "json-c gstreamer1.0 gstreamer1.0-plugins-base"
-RDEPENDS_${PN} = "agl-service-mediascanner agl-service-bluetooth gstreamer1.0-plugins-bad-waylandsink"
+RDEPENDS:${PN} = "agl-service-mediascanner agl-service-bluetooth gstreamer1.0-plugins-bad-waylandsink"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb b/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb
index c50a04804..1013ab693 100644
--- a/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb
+++ b/recipes-apis/agl-service-mediascanner/agl-service-mediascanner_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "json-c sqlite3 glib-2.0"
-RDEPENDS_${PN} = "lightmediascanner"
+RDEPENDS:${PN} = "lightmediascanner"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb b/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb
index 71a615cf4..2d40d15ee 100755
--- a/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb
+++ b/recipes-apis/agl-service-navigation/agl-service-navigation_git.bb
@@ -15,4 +15,4 @@ S  = "${WORKDIR}/git"
 
 inherit cmake aglwgt pkgconfig
 
-RDEPENDS_${PN} += "json-c libdbus-c++"
+RDEPENDS:${PN} += "json-c libdbus-c++"
diff --git a/recipes-apis/agl-service-network/agl-service-network_git.bb b/recipes-apis/agl-service-network/agl-service-network_git.bb
index c7fb72f22..3599e3cd7 100644
--- a/recipes-apis/agl-service-network/agl-service-network_git.bb
+++ b/recipes-apis/agl-service-network/agl-service-network_git.bb
@@ -16,10 +16,10 @@ DEPENDS = "glib-2.0 json-c"
 
 inherit cmake aglwgt pkgconfig
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${sbindir}
     install -m 755 ${B}/build-release/test/agl-service-network-ctl ${D}${sbindir}
 }
 
-FILES_${PN}-tools = "${sbindir}/agl-service-network-ctl"
-PACKAGES_prepend = "${PN}-tools "
+FILES:${PN}-tools = "${sbindir}/agl-service-network-ctl"
+PACKAGES:prepend = "${PN}-tools "
diff --git a/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb b/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb
index bf714f45d..8f79527e6 100644
--- a/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb
+++ b/recipes-apis/agl-service-signal-composer/agl-service-signal-composer_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 inherit cmake pkgconfig aglwgt ptest
 
 DEPENDS += "lua lua-native libappcontroller libafb-helpers"
-RDEPENDS_${PN} += "lua"
+RDEPENDS:${PN} += "lua"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-signal-composer;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "${AGL_APP_REVISION}"
diff --git a/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb b/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb
index ff3913643..656d76e0c 100644
--- a/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb
+++ b/recipes-apis/agl-service-telephony/agl-service-telephony_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "json-c glib-2.0"
-RDEPENDS_${PN} = "ofono"
+RDEPENDS:${PN} = "ofono"
 
 inherit cmake aglwgt pkgconfig
diff --git a/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb b/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb
index 85ebc90f6..90df1dc48 100644
--- a/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb
+++ b/recipes-apis/agl-service-unicens-controller/agl-service-unicens-controller_git.bb
@@ -15,5 +15,5 @@ S  = "${WORKDIR}/git"
 inherit cmake aglwgt pkgconfig
 
 DEPENDS += "json-c af-binder libafb-helpers"
-RDEPENDS_${PN} += "agl-service-unicens"
+RDEPENDS:${PN} += "agl-service-unicens"
 
diff --git a/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb b/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb
index e7e25c74e..b6f006e39 100644
--- a/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb
+++ b/recipes-apis/agl-service-unicens/agl-service-unicens_git.bb
@@ -15,5 +15,5 @@ S  = "${WORKDIR}/git"
 inherit cmake aglwgt pkgconfig
 
 DEPENDS += "alsa-lib json-c systemd af-binder glib-2.0 libxml2 libafb-helpers"
-RDEPENDS_${PN} += "libxml2 "
+RDEPENDS:${PN} += "libxml2 "
 
diff --git a/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb b/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
index b3c782bb4..54620144a 100644
--- a/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
+++ b/recipes-apis/agl-service-voice-high/agl-service-voice-high_git.bb
@@ -16,4 +16,4 @@ S = "${WORKDIR}/git"
 
 inherit cmake aglwgt
 
-RDEPENDS_${PN} += "virtual/voice-high-config"
+RDEPENDS:${PN} += "virtual/voice-high-config"
diff --git a/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb b/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
index b015dd5d9..caa66188f 100644
--- a/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
+++ b/recipes-apis/agl-service-voice-high/default-voice-high-config_1.0.bb
@@ -16,5 +16,5 @@ do_install () {
     install -D -m 644 ${WORKDIR}/voice-high.json ${D}${sysconfdir}/xdg/AGL/voice-high.json
 }
 
-RPROVIDES_${PN} += "virtual/voice-high-config"
+RPROVIDES:${PN} += "virtual/voice-high-config"
 
diff --git a/recipes-apis/agl-service-weather/agl-service-weather_git.bb b/recipes-apis/agl-service-weather/agl-service-weather_git.bb
index 75532da42..abc401f93 100644
--- a/recipes-apis/agl-service-weather/agl-service-weather_git.bb
+++ b/recipes-apis/agl-service-weather/agl-service-weather_git.bb
@@ -13,6 +13,6 @@ PV = "1.0+git${SRCPV}"
 S  = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 json-c"
-RDEPENDS_${PN} = "agl-service-geoclue"
+RDEPENDS:${PN} = "agl-service-geoclue"
 
 inherit cmake aglwgt pkgconfig