From 12ad591d3038db609db5290d8bbe809a34c743de Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Fri, 20 Aug 2021 13:58:45 -0400 Subject: Convert to new override syntax This is effectively a manual cherry-pick and squash of commits: 4249268041b879b3d2bae338d5de88f4f2d54b26 07f4ab8c2833ae5377b97cc9e3820bed67e539d0 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: I3b47f1b7d62038b314a17763d24a64f6d4e15e72 --- scripts/run-yocto-check-layer-all-layers.sh | 10 +++++----- scripts/run-yocto-check-layer.sh | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/run-yocto-check-layer-all-layers.sh b/scripts/run-yocto-check-layer-all-layers.sh index 44f6e6b11..20ded0e93 100755 --- a/scripts/run-yocto-check-layer-all-layers.sh +++ b/scripts/run-yocto-check-layer-all-layers.sh @@ -20,11 +20,11 @@ AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf # we do not import -DISTRO_FEATURES_append = " systemd smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" +DISTRO_FEATURES:append = " systemd smack" +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" #AGL_FEATURES += "aglcore agldemo" -#DISTRO_FEATURES_append = " appfw" +#DISTRO_FEATURES:append = " appfw" # workaround: # ERROR: Nothing PROVIDES 'smack' (but /home/dl9pf/AGL/master-newlayout/external/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2020.3.bb DEPENDS on or otherwise requires it) @@ -35,8 +35,8 @@ BBMASK += "meta-qt5/recipes-qt/qt5/qt5-creator_git.bb" BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb" # missing in upstream recipes ... aka FIXME upstream -BBCLASSEXTEND_pn-libzip = "native nativesdk" -BBCLASSEXTEND_pn-xmlsec1 = "native nativesdk" +BBCLASSEXTEND:pn-libzip = "native nativesdk" +BBCLASSEXTEND:pn-xmlsec1 = "native nativesdk" AGL_APP_REVISION = "${AUTOREV}" EOF diff --git a/scripts/run-yocto-check-layer.sh b/scripts/run-yocto-check-layer.sh index 507f825d3..88174820c 100755 --- a/scripts/run-yocto-check-layer.sh +++ b/scripts/run-yocto-check-layer.sh @@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf # we do not import -DISTRO_FEATURES_append = " systemd smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" +DISTRO_FEATURES:append = " systemd smack" +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" # workaround: -- cgit 1.2.3-korg