diff options
| author |   Denys Dmytriyenko <denys@konsulko.com> | 2024-01-05 23:21:58 +0000 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-01-06 18:16:09 +0000 |
| commit | 3f2c344b51b8cbb73d212aa7ab019fe5c9712d17 (patch) | |
| tree | 51ea8d7cd886d5d11fb683fc99b638baf21bc8bf | |
| parent | 58852a127c7f743c545a9b75924fdc49971db93e (diff) | |
Fix OVERRIDES additions after recent DEFAULTTUNE change
Add :agl-devel and :agl-ptest overrides using :append instead of .= operator
to defer its action after the distro config is parsed. The distro config now
resets OVERRIDES list since the recent DEFAULTTUNES change.
Bug-AGL: SPEC-5037
Reported-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I82e7832cab421726f783cec80556f59f6f4de312
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29587
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
| -rw-r--r-- | meta-agl-core/conf/include/agl-devel.inc | 2 | ||||
| -rw-r--r-- | templates/feature/agl-ptest/90_local.conf.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-agl-core/conf/include/agl-devel.inc b/meta-agl-core/conf/include/agl-devel.inc index afc284480..055fa61e3 100644 --- a/meta-agl-core/conf/include/agl-devel.inc +++ b/meta-agl-core/conf/include/agl-devel.inc @@ -12,5 +12,5 @@ IMAGE_INSTALL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' lib SDKIMAGE_FEATURES="dev-pkgs" # allows insertion of code or items specific to developement -OVERRIDES .= ":agl-devel" +OVERRIDES:append = ":agl-devel" DISTRO_FEATURES:append = " agl-devel" diff --git a/templates/feature/agl-ptest/90_local.conf.inc b/templates/feature/agl-ptest/90_local.conf.inc index 6341b012a..dcaf72ab3 100644 --- a/templates/feature/agl-ptest/90_local.conf.inc +++ b/templates/feature/agl-ptest/90_local.conf.inc @@ -1,7 +1,7 @@ # Enabling ptest in image ... -OVERRIDES .= ":agl-ptest" +OVERRIDES:append = ":agl-ptest" DISTRO_FEATURES:append = " ptest" EXTRA_IMAGE_FEATURES:append = " ptest-pkgs" IMAGE_INSTALL:append = " lua-ptest xmlsec1-ptest libxml2-ptest" |