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>

15 files changed, 30 insertions, 30 deletions

diff --git a/meta-agl-core/recipes-platform/images/agl-image-boot.bb b/meta-agl-core/recipes-platform/images/agl-image-boot.bb
index 84cdbcf31..6e2b89324 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-boot.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-boot.bb
@@ -4,6 +4,6 @@ require agl-image-boot.inc
 
 LICENSE = "MIT"
 
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
     packagegroup-agl-image-boot \
     "
diff --git a/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb b/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb
index 866d98177..3a887a5c0 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb
@@ -4,7 +4,7 @@ require agl-image-weston.inc
 
 LICENSE = "MIT"
 
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
     packagegroup-agl-profile-graphical \
     busybox \
     psplash \
diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc b/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc
index a69e698a1..8695d8d4b 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc
+++ b/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc
@@ -1,5 +1,5 @@
-IMAGE_FEATURES_append = " dev-pkgs"
-IMAGE_INSTALL_append = " kernel-dev kernel-devsrc"
+IMAGE_FEATURES:append = " dev-pkgs"
+IMAGE_INSTALL:append = " kernel-dev kernel-devsrc"
 
 
 
@@ -8,7 +8,7 @@ IMAGE_INSTALL_append = " kernel-dev kernel-devsrc"
 
 # FIXME:
 # Always include the test widgets
-#IMAGE_FEATURES_append = " agl-test-wgt"
+#IMAGE_FEATURES:append = " agl-test-wgt"
 #
 # Required dependencies for app and test builds
 #TOOLCHAIN_HOST_TASK += " \
diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal.bb b/meta-agl-core/recipes-platform/images/agl-image-minimal.bb
index 1fd213d0f..52cc06aeb 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-minimal.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-minimal.bb
@@ -4,6 +4,6 @@ require agl-image-minimal.inc
 
 LICENSE = "MIT"
 
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
     packagegroup-agl-image-minimal \
     "
diff --git a/meta-agl-core/recipes-platform/images/agl-image-weston.bb b/meta-agl-core/recipes-platform/images/agl-image-weston.bb
index bbb61c922..7e9f8814e 100644
--- a/meta-agl-core/recipes-platform/images/agl-image-weston.bb
+++ b/meta-agl-core/recipes-platform/images/agl-image-weston.bb
@@ -4,6 +4,6 @@ require agl-image-weston.inc
 
 LICENSE = "MIT"
 
-IMAGE_INSTALL_append = "\
+IMAGE_INSTALL:append = "\
     packagegroup-agl-profile-graphical \
     "
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb
index 2717dd153..fe1ee7b8c 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb
@@ -14,12 +14,12 @@ inherit packagegroup
 # Disto can override
 VIRTUAL-RUNTIME_rngd ?= "rng-tools"
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
     packagegroup-core-boot \
     ${VIRTUAL-RUNTIME_rngd} \
 "
 
-RRECOMMENDS_${PN} = "\
+RRECOMMENDS:${PN} = "\
     tzdata \
 "
 
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
index b4fe577a0..5dd274026 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb
@@ -7,11 +7,11 @@ PACKAGES = "\
     packagegroup-agl-core-connectivity \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 PKGGROUP_ZEROCONF = "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '', d)}"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests \
         connman-tools connman-ncurses' ,'',d)} \
     ${@bb.utils.contains('AGL_FEATURES', 'agl-devel', '${PKGGROUP_ZEROCONF}', '', d)} \
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb
index 3909f0351..f3e2a9eff 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
         strace \
         ldd \
         less \
@@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\
         "
 
 # needs meta-oe present
-#RRECOMMENDS_${PN} = "\
+#RRECOMMENDS:${PN} = "\
 #        jq \
 #        htop \
 #        tree \
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb
index aef732838..0ee63e82a 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb
@@ -8,7 +8,7 @@ PACKAGES = "\
     packagegroup-agl-core-os-commonlibs \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     "
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb
index 0ae5c77a3..7532f4cd7 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb
@@ -8,7 +8,7 @@ PACKAGES = "\
     packagegroup-agl-core-security \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     "
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
index cd37cb7d5..f9903d942 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb
@@ -10,7 +10,7 @@ PACKAGES = "\
     packagegroup-agl-graphical-multimedia \
     "
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     alsa-utils \
     gstreamer1.0-meta-base \
     "
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
index 6d3435d99..859303049 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb
@@ -7,9 +7,9 @@ PACKAGES = "\
     packagegroup-agl-graphical-weston \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
                   weston \
                   weston-init \
                   weston-examples \
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb
index afa04e7a1..8b2cfbb31 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb
@@ -7,12 +7,12 @@ PACKAGES = "\
     packagegroup-agl-image-boot \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     packagegroup-agl-core-boot \
     packagegroup-machine-base \
     "
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     "
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
index 45107ed9c..1a51a9bf1 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb
@@ -8,17 +8,17 @@ PACKAGES = "\
     profile-agl-minimal \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     packagegroup-agl-core-boot \
     packagegroup-machine-base \
     "
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     packagegroup-agl-core-connectivity \
     packagegroup-agl-core-os-commonlibs \
     packagegroup-agl-core-security \
     "
 
-RDEPENDS_profile-agl-minimal = "${PN}"
+RDEPENDS:profile-agl-minimal = "${PN}"
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
index bfc5e19e8..2b708603b 100644
--- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
+++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb
@@ -9,9 +9,9 @@ PACKAGES = "\
     profile-graphical \
     "
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     packagegroup-agl-image-minimal \
     packagegroup-agl-graphical-weston \
     packagegroup-agl-graphical-multimedia \
@@ -19,4 +19,4 @@ RDEPENDS_${PN} += "\
 # FIXME: Removed due to issues building against weston 5.0.0:
 #    waltham-transmitter
 
-RDEPENDS_profile-graphical = "${PN}"
+RDEPENDS:profile-graphical = "${PN}"