Convert to new override syntax

This is effectively a manual cherry-pick of commit:

37d3b1b316470fdcfebc59d5522bfbfefc025ff6

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

38 files changed, 48 insertions, 48 deletions

diff --git a/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass
index fa6211b5..c27cbd45 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass
+++ b/meta-oem-production-readiness/meta-agl-basesystem/classes/agl-basesystem-common.bbclass
@@ -1,3 +1,3 @@
 inherit bsmake
 
-DEPENDS_append = " agl-basefiles"
+DEPENDS:append = " agl-basefiles"
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb
index 0a0f4da0..a84ed706 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-backupmanager/agl-service-ns-backupmanager_1.0.0.bb
@@ -23,7 +23,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     libnv-hal \
     ns-backupmanager \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb
index acd1f9dc..ee174dad 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ns-notificationpersistent/agl-service-ns-notificationpersistent_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     os-posixbasedos001legacylibrary \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb
index 4befbf7e..12261753 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ps-communication/agl-service-ps-communication_1.0.0.bb
@@ -22,7 +22,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ps-communication \
     os-posixbasedos001legacylibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb
index b6d69381..6d402f50 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-loggerservice/agl-service-ss-loggerservice_1.0.0.bb
@@ -29,7 +29,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-config \
     ss-interfaceunified \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb
index 68417d9a..742eec88 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-powerservice/agl-service-ss-powerservice_1.0.0.bb
@@ -20,7 +20,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-romaccesslibrary \
     ns-frameworkunified \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb
index 508d0f7c..fb658eae 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-resourcemanager/agl-service-ss-resourcemanager_1.0.0.bb
@@ -24,11 +24,11 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-do_compile_prepend() {
+do_compile:prepend() {
     oe_runmake -f Makefile.client
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-resourcemanager \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb
index 9ca00350..a62ed6e8 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-systemmanager/agl-service-ss-systemmanager_1.0.0.bb
@@ -33,9 +33,9 @@ inherit agl-basesystem-common perlnative
 
 BSMAKE_FILE = "Makefile.server"
 
-FILES_${PN} += "/usr/share/*"
+FILES:${PN} += "/usr/share/*"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-ss-resourcemanager \
     agl-service-ss-loggerservice \
     agl-service-ps-communication \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb
index e950ed42..710dee91 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-ss-taskmanager/agl-service-ss-taskmanager_1.0.0.bb
@@ -28,11 +28,11 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-do_compile_prepend() {
+do_compile:prepend() {
     oe_runmake -f Makefile.client
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-resourcemanager \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb
index 02fe1565..4d4cf047 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-apis/agl-service-vs-positioning/agl-service-vs-positioning_1.0.0.bb
@@ -31,7 +31,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.server"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-config \
     ss-interfaceunified \
     ss-versionlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb
index 27b2cae0..fd40a394 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-basefiles/agl-basefiles_1.0.0.bb
@@ -17,11 +17,11 @@ do_install() {
     install -m 644 -D ${S}/include/* ${D}${includedir}/basesystem/
 }
 
-do_install_class-native() {
+do_install:class-native() {
     install -d ${D}${bindir}
     install -m 755 -D ${S}/bin/launch_xml2cfg.sh ${D}${bindir}/
 }
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb
index 4de2b702..a918ee0b 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/agl-systemd/agl-systemd_1.0.0.bb
@@ -29,9 +29,9 @@ do_install() {
     install -m 644 ${S}/99-basesystem.rules ${D}/lib/udev/rules.d/
 }
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
 
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
     launch_sm.service \
     systemd-udev-trigger.service \
     setup_refhw.service \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb
index 2d88fca3..b8e34099 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified-library_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.library"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     os-posixbasedos001legacylibrary \
     ns-loglibrary \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb
index 5017e615..d0c5bf06 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ns-frameworkunified/ns-frameworkunified_1.0.0.bb
@@ -20,7 +20,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     os-posixbasedos001legacylibrary \
     ns-loglibrary \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb
index bbd743a7..423190b3 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-config/ss-config_1.0.0.bb
@@ -22,7 +22,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ss-romaccesslibrary \
     ns-frameworkunified \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb
index ea0c0725..657a3405 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-resourcemanager/ss-resourcemanager_1.0.0.bb
@@ -23,7 +23,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ss-interfaceunified \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb
index 279995f9..18f0ab1e 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/ss-taskmanager/ss-taskmanager_1.0.0.bb
@@ -26,7 +26,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ss-interfaceunified \
     ns-frameworkunified \
     ns-commonlibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb
index 38e3aaf8..472e90bf 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-core/vs-positioning/vs-positioning_1.0.0.bb
@@ -20,7 +20,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     os-vehicleparameterlibrary \
     vs-positioningbaselibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb
index 3f7af7ad..b28c0178 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libpath-tiny-perl_0.114.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/Path-Tiny-${PV}"
 
 inherit cpan ptest-perl
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     perl-module-file-spec \
     perl-module-file-temp \
     perl-module-test-more \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
index d81f18ff..72780a67 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libscalar-list-utils-perl_1.55.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/Scalar-List-Utils-${PV}"
 
 inherit cpan ptest-perl
 
-do_install_prepend() {
+do_install:prepend() {
     # requires "-T" (taint) command line option
     rm -rf ${B}/t/tainted.t
 }
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
index 3f130550..3049ceda 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-devtools/perl/libxml-xpath-perl_1.44.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/XML-XPath-${PV}"
 
 inherit cpan ptest-perl
 
-do_install_append_class-native() {
+do_install:append:class-native() {
     # Fix xpath script shebang to work inside native environment
     sed -i 's|#!.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/xpath
 }
@@ -24,7 +24,7 @@ do_install_ptest() {
     install -m 0644 ${S}/examples/test.xml ${D}${PTEST_PATH}/examples/
 }
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     perl-module-carp \
     perl-module-data-dumper \
     perl-module-file-spec \
@@ -38,7 +38,7 @@ RDEPENDS_${PN} += " \
     libscalar-list-utils-perl \
 "
 
-RDEPENDS_${PN}-ptest += " \
+RDEPENDS:${PN}-ptest += " \
     libpath-tiny-perl \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb
index 078f157d..2c185800 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/evklib-headers.bb
@@ -17,7 +17,7 @@ do_install() {
     install -m 644 -D ${S}/agldd/* ${D}${includedir}/basesystem/agldd/
 }
 
-FILES_${PN}-dev += " \
+FILES:${PN}-dev += " \
     ${includedir}/basesystem/agldd/* \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
index f474e548..9ab15907 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-kernel/kernel-module-evklib/kernel-module-evklib_1.0.0.bb
@@ -16,7 +16,7 @@ inherit module
 
 # The inherit of module.bbclass will automatically name module packages with
 # "kernel-module-" prefix as required by the oe-core build environment.
-RPROVIDES_${PN} += " \
+RPROVIDES:${PN} += " \
     kernel-module-evk_lib \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb
index 98cf1438..ffb501e2 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-apis.bb
@@ -6,7 +6,7 @@ inherit packagegroup
 PACKAGES = "\
     packagegroup-agl-basesystem-apis \
 "
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     agl-service-ns-backupmanager \
     agl-service-ns-notificationpersistent \
     agl-service-ps-communication \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb
index 1f39fe4b..b4af51e4 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-core.bb
@@ -6,6 +6,6 @@ inherit packagegroup
 PACKAGES = "\
     packagegroup-agl-basesystem-core \
 "
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     agl-systemd \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb
index 8e69ae9e..5f84b63b 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-hal.bb
@@ -6,7 +6,7 @@ inherit packagegroup
 PACKAGES = "\
     packagegroup-bshalmake \
 "
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     libboot-hal \
     libcan-hal \
     libclock-hal \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb
index 2e5c9cf7..128f9dd6 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem-service.bb
@@ -7,7 +7,7 @@ PACKAGES = "\
     packagegroup-agl-basesystem-service \
 "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-commonlibrary \
     ns-frameworkunified \
     ns-loglibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb
index 85614c03..149f4aca 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-platform/packagegroups/packagegroup-agl-basesystem.bb
@@ -7,13 +7,13 @@ PACKAGES = "\
     packagegroup-agl-basesystem \
 "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     packagegroup-agl-image-minimal \
 "
 
-RDEPENDS_${PN}  += "\
+RDEPENDS:${PN}  += "\
     packagegroup-agl-basesystem-core \
     packagegroup-agl-basesystem-apis \
     packagegroup-agl-basesystem-service \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb
index 13e3605f..3724f894 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ns-backupmanager/ns-backupmanager_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     libnv-hal \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb
index a4aa6302..5332eb38 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-eventlibrary/os-eventlibrary_1.0.0.bb
@@ -17,6 +17,6 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     kernel-module-evklib \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb
index 573207ac..6db3ef90 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary-tool_1.0.0.bb
@@ -14,7 +14,7 @@ SRCREV := "${BASESYSTEM_REVISION}"
 
 S = "${WORKDIR}/git/service/other/rpc_library/tool"
 
-do_compile_prepend () {
+do_compile:prepend () {
     oe_runmake clean
 }
 
@@ -22,7 +22,7 @@ do_install () {
     install -D -m 755 ${S}/rpc_apidef ${D}${bindir}/rpc_apidef
 }
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${bindir}/rpc_apidef \
 "
 
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb
index b39930b6..50c84831 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-rpclibrary/os-rpclibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-commonlibrary \
     ns-loglibrary \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb
index e5ed88d5..4c8ff27a 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/os-vehicleparameterlibrary/os-vehicleparameterlibrary_1.0.0.bb
@@ -15,6 +15,6 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-backupmanager \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb
index 08625095..7eb17412 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ps-communication/ps-communication_1.0.0.bb
@@ -18,7 +18,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ps-communicationsubcpu \
 "
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb
index 6366ea8e..ed880d25 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-interfaceunified/ss-interfaceunified_1.0.0.bb
@@ -22,7 +22,7 @@ BSMAKE_FILE = "Makefile.client"
 
 DIRFILES = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-commonlibrary \
     ns-frameworkunified \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb
index dc9b1df0..42dcf22e 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-romaccesslibrary/ss-romaccesslibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ns-commonlibrary \
     ns-memorygpioaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb
index 7ff32db7..42bb3bc5 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/ss-versionlibrary/ss-versionlibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     ss-interfaceunified \
     ss-romaccesslibrary \
diff --git a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb
index d77d028a..30cb3fd6 100644
--- a/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb
+++ b/meta-oem-production-readiness/meta-agl-basesystem/recipes-support/vs-positioningbaselibrary/vs-positioningbaselibrary_1.0.0.bb
@@ -19,7 +19,7 @@ inherit agl-basesystem-common
 
 BSMAKE_FILE = "Makefile.client"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ns-frameworkunified \
     os-eventlibrary \
     os-vehicleparameterlibrary \