From a8dbd14daaac8b5c52326262dbc43975836cc0df Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 20 Aug 2021 13:57:33 -0400 Subject: 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 Change-Id: Ic649d942ac043edc52976a3d4190590bb1c125e7 --- meta-agl-lxc/conf/multiconfig/agl-container-guest.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'meta-agl-lxc/conf') diff --git a/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf b/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf index 1e2e932d..db25b3b7 100644 --- a/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf +++ b/meta-agl-lxc/conf/multiconfig/agl-container-guest.conf @@ -1,23 +1,23 @@ -OVERRIDES_append = ":aglcontainerguest" +OVERRIDES:append = ":aglcontainerguest" TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}" # Can be blank as container image type results in a .tar.bz2 -AGL_DEFAULT_IMAGE_FSTYPES_aglcontainerguest = "" -AGL_EXTRA_IMAGE_FSTYPES_aglcontainerguest = "" +AGL_DEFAULT_IMAGE_FSTYPES:aglcontainerguest = "" +AGL_EXTRA_IMAGE_FSTYPES:aglcontainerguest = "" -IMAGE_FSTYPES_aglcontainerguest = "container" +IMAGE_FSTYPES:aglcontainerguest = "container" -IMAGE_LINGUAS_append_aglcontainerguest = " en-us" +IMAGE_LINGUAS:append:aglcontainerguest = " en-us" -PREFERRED_PROVIDER_virtual/kernel_aglcontainerguest = "linux-dummy" -KERNEL_DEVICETREE_aglcontainerguest = "" +PREFERRED_PROVIDER_virtual/kernel:aglcontainerguest = "linux-dummy" +KERNEL_DEVICETREE:aglcontainerguest = "" # Disable serial consoles -SERIAL_CONSOLES_aglcontainerguest = "" +SERIAL_CONSOLES:aglcontainerguest = "" # Remove unneeded firmware packages -EXTRA_IMAGEDEPENDS_remove_aglcontainerguest = "arm-trusted-firmware optee-os u-boot" +EXTRA_IMAGEDEPENDS:remove:aglcontainerguest = "arm-trusted-firmware optee-os u-boot" # We assume rngd is running on the host, so unnecessary in container VIRTUAL-RUNTIME_rngd = "" -- cgit 1.2.3-korg