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/feature | |
| 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/feature')
8 files changed, 12 insertions, 12 deletions
diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc index cbf0c7d2b..319c5cbb7 100644 --- a/templates/feature/agl-ci/99_local.conf.inc +++ b/templates/feature/agl-ci/99_local.conf.inc @@ -1,7 +1,7 @@ -DISTRO_FEATURES_append = " AGLCI" +DISTRO_FEATURES:append = " AGLCI" # opencv seems to have a parallel make bug # ...contrib/modules/xfeatures2d/test/test_features2d.cpp:51:10: fatal error: features2d/test/test_detectors_regression.impl.hpp: No such file or directory -PARALLEL_MAKE_pn-opencv = "-j 1" +PARALLEL_MAKE:pn-opencv = "-j 1" AGL_HOST_PREMIRROR ?= "http://download.automotivelinux.org" AGL_HOST_SSTATE_MIRROR ?= "http://download.automotivelinux.org" diff --git a/templates/feature/agl-devel/README_feature_agl-devel.md b/templates/feature/agl-devel/README_feature_agl-devel.md index 24483f95e..588bb3cdc 100644 --- a/templates/feature/agl-devel/README_feature_agl-devel.md +++ b/templates/feature/agl-devel/README_feature_agl-devel.md @@ -25,7 +25,7 @@ The following example shows how to activate C/C++ code specific to agl-devel: ```yocto -CPPFLAGS_append_agl-devel = " -DAGL_DEVEL" +CPPFLAGS:append:agl-devel = " -DAGL_DEVEL" ``` Using this, any code enclosed in diff --git a/templates/feature/agl-hmi-framework/50_local.conf.inc b/templates/feature/agl-hmi-framework/50_local.conf.inc index 21fdf3abf..fdff3dbe8 100644 --- a/templates/feature/agl-hmi-framework/50_local.conf.inc +++ b/templates/feature/agl-hmi-framework/50_local.conf.inc @@ -1,4 +1,4 @@ # In order to enable the hmi-framework features , # enables the following line: # -AGL_FEATURES_append = " agl-hmi-framework" +AGL_FEATURES:append = " agl-hmi-framework" diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc index 4c546e70e..6341b012a 100644 --- a/templates/feature/agl-ptest/90_local.conf.inc +++ b/templates/feature/agl-ptest/90_local.conf.inc @@ -2,8 +2,8 @@ # Enabling ptest in image ... OVERRIDES .= ":agl-ptest" -DISTRO_FEATURES_append = " ptest" -EXTRA_IMAGE_FEATURES_append = " ptest-pkgs" -IMAGE_INSTALL_append = " lua-ptest xmlsec1-ptest libxml2-ptest" +DISTRO_FEATURES:append = " ptest" +EXTRA_IMAGE_FEATURES:append = " ptest-pkgs" +IMAGE_INSTALL:append = " lua-ptest xmlsec1-ptest libxml2-ptest" # / ptest diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc index 3ceb04df7..8019022c4 100644 --- a/templates/feature/agl-sota/50_local.conf.inc +++ b/templates/feature/agl-sota/50_local.conf.inc @@ -1,7 +1,7 @@ # See meta-updater/conf/distro/sota.conf.inc INHERIT += "sota" -DISTRO_FEATURES_append = " sota usrmerge" -DISTRO_FEATURES_NATIVE_append = " sota" +DISTRO_FEATURES:append = " sota usrmerge" +DISTRO_FEATURES_NATIVE:append = " sota" AGL_DEFAULT_INITRAMFS_FSTYPES = "cpio.gz" # Netboot is not obeying usrmerge distro feature # therefore it is not compatible with agl-sota diff --git a/templates/feature/agl-virt/50_local.conf.inc b/templates/feature/agl-virt/50_local.conf.inc index c15b8316b..8a7e44a71 100644 --- a/templates/feature/agl-virt/50_local.conf.inc +++ b/templates/feature/agl-virt/50_local.conf.inc @@ -1,3 +1,3 @@ # meta-virtualization needs the "virtualization in DISTRO_FEATURES -DISTRO_FEATURES_append = " virtualization" +DISTRO_FEATURES:append = " virtualization" diff --git a/templates/feature/agl-weston-remoting/50_local.conf.inc b/templates/feature/agl-weston-remoting/50_local.conf.inc index da1ddb3a0..63e0a984a 100644 --- a/templates/feature/agl-weston-remoting/50_local.conf.inc +++ b/templates/feature/agl-weston-remoting/50_local.conf.inc @@ -1 +1 @@ -DISTRO_FEATURES_append = " weston-remoting" +DISTRO_FEATURES:append = " weston-remoting" diff --git a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc b/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc index a8267ec37..d965eae6f 100644 --- a/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc +++ b/templates/feature/agl-weston-waltham-remoting/50_local.conf.inc @@ -1 +1 @@ -AGL_FEATURES_append = " waltham-remoting" +AGL_FEATURES:append = " waltham-remoting" |