Convert to new override syntax

This is the result of running a slightly customized version of the
convert-overrides.py script from poky with additional overrides
added.

The intent of these changes is to minimize the effort to keep the
"next" branch that builds against poky master up to date and tested
in preparation for the switch to the next Yocto LTS release in
early 2022.

Bug-AGL: SPEC-4052

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I6eeadd2c985c008b04f8f9815bf0f6fb064bedac

28 files changed, 44 insertions, 44 deletions

diff --git a/recipes-demo/alexa-viewer/alexa-viewer_git.bb b/recipes-demo/alexa-viewer/alexa-viewer_git.bb
index 78ee2ea3..d8af6888 100644
--- a/recipes-demo/alexa-viewer/alexa-viewer_git.bb
+++ b/recipes-demo/alexa-viewer/alexa-viewer_git.bb
@@ -27,9 +27,9 @@ S  = "${WORKDIR}/git"
 
 inherit cmake_qt5 aglwgt
 
-OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
+OECMAKE_CXX_FLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     libqtappfw \
     libafbwsc \
     qlibhomescreen \
diff --git a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb b/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
index f08e4101..4fe09e91 100644
--- a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
+++ b/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb
@@ -20,7 +20,7 @@ S  = "${WORKDIR}/git"
 
 inherit cmake pkgconfig aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good \
     gstreamer1.0-plugins-bad \
diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
index f8dad08f..480d1f22 100644
--- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
+++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
@@ -21,7 +21,7 @@ S  = "${WORKDIR}/git"
 
 inherit pkgconfig cmake_qt5 aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtquickcontrols \
     qtquickcontrols-qmlplugins \
     qtquickcontrols2 \
diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
index 4366bd55..8b5b6209 100644
--- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
+++ b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
@@ -18,7 +18,7 @@ S  = "${WORKDIR}/git"
 
 inherit pkgconfig cmake_qt5 aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtquickcontrols \
     qtquickcontrols-qmlplugins \
     qtquickcontrols2 \
diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb
index 7af8209a..7028d5fc 100644
--- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb
+++ b/recipes-demo/cluster-receiver/cluster-receiver_git.bb
@@ -20,7 +20,7 @@ S  = "${WORKDIR}/git"
 
 inherit cmake pkgconfig aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good \
     gstreamer1.0-plugins-bad \
diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
index a0fde07e..80f8edbb 100644
--- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
+++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
@@ -23,7 +23,7 @@ S  = "${WORKDIR}/git"
 
 inherit cmake_qt5 pkgconfig aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good \
     gstreamer1.0-plugins-bad \
diff --git a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb b/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
index 4be666bc..f8cf9b92 100644
--- a/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
+++ b/recipes-demo/cluster-windowmanager-conf/cluster-windowmanager-conf_1.0.bb
@@ -16,4 +16,4 @@ do_install() {
     install -m 0644 ${WORKDIR}/roles.db ${D}${sysconfdir}/xdg/windowmanager/roles.db
 }
 
-#FILES_${PN} += "${sysconfdir}/*"
+#FILES:${PN} += "${sysconfdir}/*"
diff --git a/recipes-demo/dashboard/dashboard_git.bb b/recipes-demo/dashboard/dashboard_git.bb
index 64031d5e..22f5b73e 100644
--- a/recipes-demo/dashboard/dashboard_git.bb
+++ b/recipes-demo/dashboard/dashboard_git.bb
@@ -17,7 +17,7 @@ S  = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     libqtappfw \
     agl-service-signal-composer \
 "
diff --git a/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb b/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb
index 8155b659..d3335699 100644
--- a/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb
+++ b/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb
@@ -28,10 +28,10 @@ SRCREV  = "${AGL_APP_REVISION}"
 PV      = "1.0+git${SRCPV}"
 S       = "${WORKDIR}/git"
 
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
 
-OE_QMAKE_CXXFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
+OE_QMAKE_CXXFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         libqtappfw \
 "
diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb
index 0347caf7..bf8034b9 100644
--- a/recipes-demo/homescreen/homescreen_git.bb
+++ b/recipes-demo/homescreen/homescreen_git.bb
@@ -28,11 +28,11 @@ S       = "${WORKDIR}/git"
 
 inherit qmake5 systemd pkgconfig aglwgt
 
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
 
-OE_QMAKE_CXXFLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
+OE_QMAKE_CXXFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     libqtappfw \
     agl-service-audiomixer \
     agl-service-bluetooth \
diff --git a/recipes-demo/hvac/hvac_git.bb b/recipes-demo/hvac/hvac_git.bb
index ed2cce7e..c7da0ef4 100644
--- a/recipes-demo/hvac/hvac_git.bb
+++ b/recipes-demo/hvac/hvac_git.bb
@@ -22,4 +22,4 @@ S  = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} = "agl-service-hvac libqtappfw"
+RDEPENDS:${PN} = "agl-service-hvac libqtappfw"
diff --git a/recipes-demo/inputeventmanager/inputeventmanager_git.bb b/recipes-demo/inputeventmanager/inputeventmanager_git.bb
index 8a0c72c1..8718f184 100644
--- a/recipes-demo/inputeventmanager/inputeventmanager_git.bb
+++ b/recipes-demo/inputeventmanager/inputeventmanager_git.bb
@@ -15,7 +15,7 @@ SRCREV  = "b2f1646ac78cf61acd66c643b7638bd1b007d5a0"
 # PV needs to be modified with SRCPV to work AUTOREV correctly
 PV = "0.0+git${SRCPV}"
 
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
 
 do_install() {
     install -d ${D}/usr/AGL/${PN}
@@ -25,6 +25,6 @@ do_install() {
     install -m 0644 ${S}/inputeventmanager/conf/InputEventManager.service ${D}${systemd_user_unitdir}
 }
 
-FILES_${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}"
-FILES_${PN}-dbg += "/usr/AGL/${PN}/.debug"
+FILES:${PN} += "/usr/AGL/${PN}/ ${systemd_user_unitdir}"
+FILES:${PN}-dbg += "/usr/AGL/${PN}/.debug"
 
diff --git a/recipes-demo/launcher/launcher_git.bb b/recipes-demo/launcher/launcher_git.bb
index 4c3a6d95..d2de209a 100644
--- a/recipes-demo/launcher/launcher_git.bb
+++ b/recipes-demo/launcher/launcher_git.bb
@@ -27,6 +27,6 @@ S       = "${WORKDIR}/git"
 
 inherit qmake5 systemd pkgconfig aglwgt
 
-PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
+PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"
 
-RDEPENDS_${PN} = "agl-service-homescreen"
+RDEPENDS:${PN} = "agl-service-homescreen"
diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb
index 26d4e597..f6538fdc 100644
--- a/recipes-demo/mediaplayer/mediaplayer_git.bb
+++ b/recipes-demo/mediaplayer/mediaplayer_git.bb
@@ -17,4 +17,4 @@ S  = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-mediaplayer libqtappfw"
+RDEPENDS:${PN} += "agl-service-mediaplayer libqtappfw"
diff --git a/recipes-demo/messaging/messaging_git.bb b/recipes-demo/messaging/messaging_git.bb
index 5d5e7a6d..586996c7 100644
--- a/recipes-demo/messaging/messaging_git.bb
+++ b/recipes-demo/messaging/messaging_git.bb
@@ -17,4 +17,4 @@ S  = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-bluetooth-map libqtappfw"
+RDEPENDS:${PN} += "agl-service-bluetooth-map libqtappfw"
diff --git a/recipes-demo/mixer/mixer_git.bb b/recipes-demo/mixer/mixer_git.bb
index 2ccd111d..c99c0442 100644
--- a/recipes-demo/mixer/mixer_git.bb
+++ b/recipes-demo/mixer/mixer_git.bb
@@ -23,7 +23,7 @@ S  = "${WORKDIR}/git"
 
 inherit cmake_qt5 aglwgt
 
-OECMAKE_CXX_FLAGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
+OECMAKE_CXX_FLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '' , '-DQT_NO_DEBUG_OUTPUT', d)}"
 
-RDEPENDS_${PN} = "agl-service-audiomixer"
-RPROVIDES_${PN} += "virtual/mixer"
+RDEPENDS:${PN} = "agl-service-audiomixer"
+RPROVIDES:${PN} += "virtual/mixer"
diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb
index a37838c2..5264ba63 100644
--- a/recipes-demo/navigation/ondemandnavi_git.bb
+++ b/recipes-demo/navigation/ondemandnavi_git.bb
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt pkgconfig
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtlocation \
     flite \
     libqtappfw \
@@ -27,5 +27,5 @@ RDEPENDS_${PN} += " \
     agl-service-navigation \
 "
 
-RPROVIDES_${PN} = "virtual/navigation"
+RPROVIDES:${PN} = "virtual/navigation"
 
diff --git a/recipes-demo/navigation/poiapp_git.bb b/recipes-demo/navigation/poiapp_git.bb
index 55d1142d..08e174f7 100644
--- a/recipes-demo/navigation/poiapp_git.bb
+++ b/recipes-demo/navigation/poiapp_git.bb
@@ -20,4 +20,4 @@ S = "${WORKDIR}/git"
 
 inherit cmake_qt5 pkgconfig aglwgt
 
-RDEPENDS_${PN} = "qtbase libqtappfw"
+RDEPENDS:${PN} = "qtbase libqtappfw"
diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb
index 0dc09411..a4f22545 100644
--- a/recipes-demo/navigation/tbtnavi_git.bb
+++ b/recipes-demo/navigation/tbtnavi_git.bb
@@ -29,7 +29,7 @@ S = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt pkgconfig
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtlocation \
     ondemandnavi-config \
     agl-service-navigation \
diff --git a/recipes-demo/phone/phone_git.bb b/recipes-demo/phone/phone_git.bb
index dbfb639f..71ef6ed7 100644
--- a/recipes-demo/phone/phone_git.bb
+++ b/recipes-demo/phone/phone_git.bb
@@ -17,7 +17,7 @@ S = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-telephony \
     agl-service-bluetooth-pbap \
     libqtappfw \
diff --git a/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb b/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
index be2eace5..04708b95 100644
--- a/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
+++ b/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb
@@ -14,14 +14,14 @@ S = "${WORKDIR}/git"
 
 inherit qmake5
 
-do_install_append_class-target() {
+do_install:append:class-target() {
     install -d ${D}/${sysconfdir}/afm/unit.env.d
     echo "QT_QUICK_CONTROLS_STYLE=AGL" > ${D}${sysconfdir}/afm/unit.env.d/qtquickcontrols2-style
 }
 
-FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtQuick/Controls.2/AGL/*"
+FILES:${PN} += "${OE_QMAKE_PATH_QML}/QtQuick/Controls.2/AGL/*"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtquickcontrols-qmlplugins \
     qtquickcontrols2-qmlplugins \
     qtsvg-plugins \
diff --git a/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb b/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
index a81e1a9c..9457606f 100644
--- a/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
+++ b/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb
@@ -14,9 +14,9 @@ S = "${WORKDIR}/git"
 
 inherit qmake5
 
-FILES_${PN} += "${OE_QMAKE_PATH_QML}/AGL/Demo/Controls/*"
+FILES:${PN} += "${OE_QMAKE_PATH_QML}/AGL/Demo/Controls/*"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtquickcontrols-qmlplugins \
     qtquickcontrols2-qmlplugins \
     qtsvg-plugins \
diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb
index 459bfc16..c635f2c3 100644
--- a/recipes-demo/radio/radio_git.bb
+++ b/recipes-demo/radio/radio_git.bb
@@ -23,7 +23,7 @@ inherit qmake5 aglwgt
 
 # ALS, CES, FOSDEM available
 AGL_RADIO_PRESETS_LOCALE ?= "CES"
-do_install_append() {
+do_install:append() {
     install -d ${D}${sysconfdir}/xdg/AGL
     install -m 0644 ${WORKDIR}/presets-CES.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-CES.conf
     install -m 0644 ${WORKDIR}/presets-ALS.conf ${D}${sysconfdir}/xdg/AGL/radio-presets-ALS.conf
@@ -31,6 +31,6 @@ do_install_append() {
     install -m 0644 ${WORKDIR}/presets-${AGL_RADIO_PRESETS_LOCALE}.conf ${D}${sysconfdir}/xdg/AGL/radio-presets.conf
 }
 
-FILES_${PN} += "${sysconfdir}/xdg/AGL/*"
+FILES:${PN} += "${sysconfdir}/xdg/AGL/*"
 
-RDEPENDS_${PN} += "agl-service-radio libqtappfw"
+RDEPENDS:${PN} += "agl-service-radio libqtappfw"
diff --git a/recipes-demo/settings/settings_git.bb b/recipes-demo/settings/settings_git.bb
index b3198b28..60cbdf59 100644
--- a/recipes-demo/settings/settings_git.bb
+++ b/recipes-demo/settings/settings_git.bb
@@ -22,7 +22,7 @@ S  = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qt-qrcode \
     agl-service-bluetooth \
     agl-service-network \
diff --git a/recipes-demo/simple-can-simulator/simple-can-simulator.bb b/recipes-demo/simple-can-simulator/simple-can-simulator.bb
index a2415942..947e0c6a 100644
--- a/recipes-demo/simple-can-simulator/simple-can-simulator.bb
+++ b/recipes-demo/simple-can-simulator/simple-can-simulator.bb
@@ -12,4 +12,4 @@ do_install() {
     install -m 0755 ${WORKDIR}/simple_can_simulator.py ${D}${sbindir}
 }
 
-RDEPENDS_${PN} = "python3"
+RDEPENDS:${PN} = "python3"
diff --git a/recipes-demo/taskmanager/taskmanager_git.bb b/recipes-demo/taskmanager/taskmanager_git.bb
index 9b96c868..96b6d270 100644
--- a/recipes-demo/taskmanager/taskmanager_git.bb
+++ b/recipes-demo/taskmanager/taskmanager_git.bb
@@ -23,4 +23,4 @@ S  = "${WORKDIR}/git"
 
 inherit qmake5 aglwgt
 
-RDEPENDS_${PN} += "agl-service-taskmanager libqtappfw"
+RDEPENDS:${PN} += "agl-service-taskmanager libqtappfw"
diff --git a/recipes-demo/telematics-recorder/telematics-recorder_git.bb b/recipes-demo/telematics-recorder/telematics-recorder_git.bb
index 5f8a464e..322acc5c 100644
--- a/recipes-demo/telematics-recorder/telematics-recorder_git.bb
+++ b/recipes-demo/telematics-recorder/telematics-recorder_git.bb
@@ -17,7 +17,7 @@ S  = "${WORKDIR}/git"
 
 inherit cmake aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-can-low-level \
     agl-service-gps \
     agl-service-network \
diff --git a/recipes-demo/waltham-receiver/waltham-receiver_git.bb b/recipes-demo/waltham-receiver/waltham-receiver_git.bb
index 794b2def..75ada4dd 100644
--- a/recipes-demo/waltham-receiver/waltham-receiver_git.bb
+++ b/recipes-demo/waltham-receiver/waltham-receiver_git.bb
@@ -20,7 +20,7 @@ S  = "${WORKDIR}/git"
 
 inherit cmake pkgconfig aglwgt
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     gstreamer1.0-plugins-base \
     gstreamer1.0-plugins-good \
     gstreamer1.0-plugins-bad \