diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-08-02 17:10:51 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-11-20 00:33:16 +0000 |
| commit | bad73bf315325c3428e331984f9d17bb8b2873b3 (patch) | |
| tree | f1af509d2d534d7232ab63304faf52e549fbaeca /templates/base | |
| parent | 5f1d801530f9b3d7f99826b4cc8cc23df77d1e42 (diff) | |
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>
Diffstat (limited to 'templates/base')
| -rw-r--r-- | templates/base/01_setup_pkg_revision.sh | 4 | ||||
| -rw-r--r-- | templates/base/99_local.conf.inc | 2 | ||||
| -rw-r--r-- | templates/base/local.conf.sample | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/templates/base/01_setup_pkg_revision.sh b/templates/base/01_setup_pkg_revision.sh index 034256c7d..cba278d18 100644 --- a/templates/base/01_setup_pkg_revision.sh +++ b/templates/base/01_setup_pkg_revision.sh @@ -36,7 +36,7 @@ EOF cat <<'EOF' >> $LOCALCONF PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}" PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}" -BB_HASHBASE_WHITELIST_append = " PKGR PKGV" +BB_HASHBASE_WHITELIST:append = " PKGR PKGV" EOF ;; value:*) @@ -44,7 +44,7 @@ EOF cat <<'EOF' >> $LOCALCONF PKGR = "${PR}${EXTENDPRAUTO}.${AGL_PR}" PKGV = "${@ '${PV}'.replace('AUTOINC','${AGL_PR}')}" -BB_HASHBASE_WHITELIST_append = " PKGR PKGV" +BB_HASHBASE_WHITELIST:append = " PKGR PKGV" EOF ;; none) diff --git a/templates/base/99_local.conf.inc b/templates/base/99_local.conf.inc index bbf1b2afa..be5dd9321 100644 --- a/templates/base/99_local.conf.inc +++ b/templates/base/99_local.conf.inc @@ -4,7 +4,7 @@ # ARM 32bit 'medium' compiler (armv7thf instead of armv7ve) # (only use for CPUs <= cortex-a9 / w/o virt extension - e.g. cortex-a8) -# AGL_FEATURES_append = " agl-medium-arm-compiler" +# AGL_FEATURES:append = " agl-medium-arm-compiler" ###################### diff --git a/templates/base/local.conf.sample b/templates/base/local.conf.sample index d506c8182..337321ec0 100644 --- a/templates/base/local.conf.sample +++ b/templates/base/local.conf.sample @@ -163,7 +163,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 @@ -241,14 +241,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+" # # Parallelism Options |