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>

6 files changed, 46 insertions, 46 deletions

diff --git a/meta-agl-core/conf/distro/include/aarch64-tune.inc b/meta-agl-core/conf/distro/include/aarch64-tune.inc
index 553bb5a64..320b4f1ac 100644
--- a/meta-agl-core/conf/distro/include/aarch64-tune.inc
+++ b/meta-agl-core/conf/distro/include/aarch64-tune.inc
@@ -4,7 +4,7 @@
 # A double inclusion would produce a warning. This include line is just for reference
 # include conf/machine/include/arm/arch-armv8.inc
 
-DEFAULTTUNE_poky-agl := "aarch64"
+DEFAULTTUNE:poky-agl := "aarch64"
 # not yet ready
 #QB_SYSTEM_NAME ?= "qemu-system-aarch"
 #QB_DEFAULT_KERNEL ?= "zImage"
diff --git a/meta-agl-core/conf/distro/include/x86_64-tune.inc b/meta-agl-core/conf/distro/include/x86_64-tune.inc
index 9f2bdc867..a0b5abdfb 100644
--- a/meta-agl-core/conf/distro/include/x86_64-tune.inc
+++ b/meta-agl-core/conf/distro/include/x86_64-tune.inc
@@ -15,41 +15,41 @@ TUNE_CCARGS = "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=corei7 -
 
 # Extra tune selections
 AVAILTUNES += "corei7-32"
-TUNE_FEATURES_tune-corei7-32 = "${TUNE_FEATURES_tune-x86} corei7"
-BASE_LIB_tune-corei7-32 = "lib"
-TUNE_PKGARCH_tune-corei7-32 = "corei7-32"
-PACKAGE_EXTRA_ARCHS_tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-32} corei7-32"
+TUNE_FEATURES:tune-corei7-32 = "${TUNE_FEATURES:tune-x86} corei7"
+BASE_LIB:tune-corei7-32 = "lib"
+TUNE_PKGARCH:tune-corei7-32 = "corei7-32"
+PACKAGE_EXTRA_ARCHS:tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-32} corei7-32"
 QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false"
 
 AVAILTUNES += "corei7-64"
-TUNE_FEATURES_tune-corei7-64 = "${TUNE_FEATURES_tune-x86-64} corei7"
-BASE_LIB_tune-corei7-64 = "lib64"
-TUNE_PKGARCH_tune-corei7-64 = "corei7-64"
-PACKAGE_EXTRA_ARCHS_tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64"
+TUNE_FEATURES:tune-corei7-64 = "${TUNE_FEATURES:tune-x86-64} corei7"
+BASE_LIB:tune-corei7-64 = "lib64"
+TUNE_PKGARCH:tune-corei7-64 = "corei7-64"
+PACKAGE_EXTRA_ARCHS:tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64"
 QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false"
 
 AVAILTUNES += "corei7-64-x32"
-TUNE_FEATURES_tune-corei7-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} corei7"
-BASE_LIB_tune-corei7-64-x32 = "libx32"
-TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32"
-PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32"
+TUNE_FEATURES:tune-corei7-64-x32 = "${TUNE_FEATURES:tune-x86-64-x32} corei7"
+BASE_LIB:tune-corei7-64-x32 = "libx32"
+TUNE_PKGARCH:tune-corei7-64-x32 = "corei7-64-x32"
+PACKAGE_EXTRA_ARCHS:tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64-x32} corei7-64-x32"
 QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false"
 
 TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}"
 
 # Bump qemux86-64 up to corei7
 AVAILTUNES += "qemux86-64"
-TUNE_FEATURES_tune-qemux86-64 = "${TUNE_FEATURES_tune-x86-64} corei7"
-BASE_LIB_tune-qemux86-64 = "lib64"
-TUNE_PKGARCH_tune-qemux86-64 = "corei7-64"
-PACKAGE_EXTRA_ARCHS_tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64"
-QEMU_EXTRAOPTIONS_qemux86-64 = " -cpu Nehalem,check=false"
+TUNE_FEATURES:tune-qemux86-64 = "${TUNE_FEATURES:tune-x86-64} corei7"
+BASE_LIB:tune-qemux86-64 = "lib64"
+TUNE_PKGARCH:tune-qemux86-64 = "corei7-64"
+PACKAGE_EXTRA_ARCHS:tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64"
+QEMU_EXTRAOPTIONS:qemux86-64 = " -cpu Nehalem,check=false"
 
 # QEMU / runqemu options (partly overrides qemuboot-x86.inc)
 QB_MACHINE = "-machine q35"
-QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
-QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
-QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
+QB_SYSTEM_NAME:x86-64 = "qemu-system-x86_64"
+QB_CPU:x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
+QB_CPU_KVM:x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt"
 
 # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
 QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci"
diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 7d81b8dff..7324b3211 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -16,15 +16,15 @@ OVERRIDES .= ":${AGLRELEASETYPE}"
 #
 
 #for development
-DISTRO_VERSION_agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
-AGL_APP_REVISION_agldevelopment = "${AUTOREV}"
-AGL_DEFAULT_REVISION_agldevelopment = "${AUTOREV}"
+DISTRO_VERSION:agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
+AGL_APP_REVISION:agldevelopment = "${AUTOREV}"
+AGL_DEFAULT_REVISION:agldevelopment = "${AUTOREV}"
 
 #for release
-DISTRO_VERSION_aglrelease := "${AGLVERSION}"
+DISTRO_VERSION:aglrelease := "${AGLVERSION}"
 DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
-AGL_APP_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-AGL_DEFAULT_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+AGL_APP_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+AGL_DEFAULT_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 
 # reproducible builds:
 # enable the flag
@@ -54,7 +54,7 @@ AGL_DEFAULT_DISTRO_FEATURES = "largefile opengl wayland pam bluetooth bluez5 3g
 POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
 OVERRIDES .= ":${DISTRO_CODENAME}"
 
-DISTRO_FEATURES_remove = "x11"
+DISTRO_FEATURES:remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 INIT_MANAGER = "systemd"
@@ -107,7 +107,7 @@ CONNECTIVITY_CHECK_URIS ?= ""
 #BB_DANGLINGAPPENDS_WARNONLY = "1"
 
 # Not yet upstreamed; should be submitted.
-SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS:pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
 
 #Redefined USER_CLASSES
 #Disable prelink. It is unmaintained and likely will go away.
@@ -118,7 +118,7 @@ USER_CLASSES = "buildstats image-mklibs"
 # 2 for ARM 32bit 
 #   - a high and a medium setting for the CCARGS
 #   - the high setting is default (needs >= cortex-a15)
-#   - the medium setting is enabled with: DISTRO_FEATURES_append = " agl-medium-arm-compiler "
+#   - the medium setting is enabled with: DISTRO_FEATURES:append = " agl-medium-arm-compiler "
 # 1 for ARM 64bit / AARCH64
 # 1 for x86-64
 # 1 for RISC-V 64-bit
@@ -140,8 +140,8 @@ AGL_EXTRA_INITRAMFS_FSTYPES ??= ""
 #
 # Default IMAGE FSTYPES wic.xz
 AGL_DEFAULT_IMAGE_FSTYPES ?= "wic.xz wic.bmap wic.xz.sha256sum"
-AGL_DEFAULT_IMAGE_FSTYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
-AGL_DEFAULT_IMAGE_FSTYPES_append_netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+AGL_DEFAULT_IMAGE_FSTYPES:qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+AGL_DEFAULT_IMAGE_FSTYPES:append:netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
 AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 
 # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
@@ -150,7 +150,7 @@ IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
 INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
 #
 # THE FUTURE is 'wic'
-# IMAGE_FSTYPES_append = " wic"
+# IMAGE_FSTYPES:append = " wic"
 
 # Complementary package definitions for agl-test-wgt and agl-devel-wgt
 # image features
@@ -159,7 +159,7 @@ COMPLEMENTARY_GLOB[agl-devel-wgt] = '*-coverage *-debug'
 
 # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
 # (revalidate after 2017-10-15, 2018-06-12: still required)
-DIRFILES_pn-nativesdk-cmake = "1"
+DIRFILES:pn-nativesdk-cmake = "1"
 
 # For https://jira.automotivelinux.org/browse/SPEC-1629 :
 # We exclude the conflicting vars from the sstate task hash.
diff --git a/meta-agl-core/conf/include/agl-devel.inc b/meta-agl-core/conf/include/agl-devel.inc
index 919f066a7..394ff07b9 100644
--- a/meta-agl-core/conf/include/agl-devel.inc
+++ b/meta-agl-core/conf/include/agl-devel.inc
@@ -1,13 +1,13 @@
 IMAGE_FEATURES =+ "debug-tweaks tools-debug tools-profile"
 
-IMAGE_INSTALL_append = " \
+IMAGE_INSTALL:append = " \
     packagegroup-agl-core-devel \
 "
 
 # Install libdrm-test, including modetest, to images with GUI
-IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"
+IMAGE_INSTALL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}"
 
-IMAGE_FEATURES_append = " agl-devel-wgt"
+IMAGE_FEATURES:append = " agl-devel-wgt"
 
 # disable install of debug files in SDK
 # initial value: SDKIMAGE_FEATURES="dev-pkgs dbg-pkgs staticdev-pkgs"
@@ -15,4 +15,4 @@ SDKIMAGE_FEATURES="dev-pkgs"
 
 # allows insertion of code or items specific to developement
 OVERRIDES .= ":agl-devel"
-DISTRO_FEATURES_append = " agl-devel"
+DISTRO_FEATURES:append = " agl-devel"
diff --git a/meta-agl-core/conf/include/base-agl.inc b/meta-agl-core/conf/include/base-agl.inc
index f132359a9..30bfc93d3 100644
--- a/meta-agl-core/conf/include/base-agl.inc
+++ b/meta-agl-core/conf/include/base-agl.inc
@@ -4,10 +4,10 @@
 MODULE_TARBALL_DEPLOY ?= "0"
 
 # Comment out below if want to use QtWebkit
-PACKAGECONFIG_remove_pn-qtquick1 = "webkit"
+PACKAGECONFIG:remove:pn-qtquick1 = "webkit"
 
 
-ASSUME_PROVIDED_remove = "tar-native"
+ASSUME_PROVIDED:remove = "tar-native"
 
 # Use static IDs to enable full-filesystem updates
 USERADDEXTENSION = "useradd-staticids"
diff --git a/meta-agl-core/conf/local.conf.sample b/meta-agl-core/conf/local.conf.sample
index 82c9dddc1..8fa6d05a2 100644
--- a/meta-agl-core/conf/local.conf.sample
+++ b/meta-agl-core/conf/local.conf.sample
@@ -152,7 +152,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 #   - 'image-prelink' in order to prelink the filesystem image
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
-USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+USER_CLASSES ?= "buildstats image-prelink"
 
 #
 # Runtime testing of images
@@ -162,7 +162,7 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 # run tests against any SDK that are built. To enable this uncomment these lines.
 # See classes/test{image,sdk}.bbclass for further details.
 #IMAGE_CLASSES += "testimage testsdk"
-#TESTIMAGE_AUTO_qemuall = "1"
+#TESTIMAGE_AUTO:qemuall = "1"
 
 #
 # Interactive shell configuration
@@ -238,14 +238,14 @@ BB_DISKMON_DIRS ??= "\
 #
 # By default native qemu will build with a builtin VNC server where graphical output can be
 # seen. The line below enables the SDL UI frontend too.
-PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
 # By default libsdl2-native will be built, if you want to use your host's libSDL instead of
 # the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
 #ASSUME_PROVIDED += "libsdl2-native"
 
 # You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
 # a handy set of menus for controlling the emulator.
-#PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
 
 #
 # Hash Equivalence
@@ -270,8 +270,8 @@ CONF_VERSION = "1"
 AGL_FEATURES ?= ""
 AGL_EXTRA_IMAGE_FSTYPES ?= ""
 
-DISTRO_FEATURES_append = " systemd "
-DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit"
+DISTRO_FEATURES:append = " systemd "
+DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
 # soon: INIT_MANAGER = "systemd"