From dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 2 Aug 2021 17:10:51 -0400 Subject: Convert to new override syntax This is mostly the result of running a slightly customized version of the convert-overrides.py script from poky with additional overrides added. A few minor fixups were done by hand afterwards during a review of the changes. The intent of these changes is to minimize the effort to keep the "next" branch that builds against poky master up to date and tested in preparation for the switch to the next Yocto LTS release in early 2022. Bug-AGL: SPEC-4052 Signed-off-by: Scott Murray Change-Id: Ia3bf63b7cb1aa1d95ada373d1a3ab56def0a125d Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26564 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 --- meta-app-framework/conf/include/agl-appfw-smack.inc | 10 +++++----- meta-app-framework/conf/include/agl-sign-wgts.inc | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-app-framework/conf/include') diff --git a/meta-app-framework/conf/include/agl-appfw-smack.inc b/meta-app-framework/conf/include/agl-appfw-smack.inc index 831368a31..f22fe715c 100644 --- a/meta-app-framework/conf/include/agl-appfw-smack.inc +++ b/meta-app-framework/conf/include/agl-appfw-smack.inc @@ -1,7 +1,7 @@ # enable security features (smack, cynagora) - required by Application Framework OVERRIDES .= ":with-lsm-smack" -DISTRO_FEATURES_append = " smack xattr" -DISTRO_FEATURES_NATIVE_append = " smack xattr" +DISTRO_FEATURES:append = " smack xattr" +DISTRO_FEATURES_NATIVE:append = " smack xattr" APPFW_ENABLED = "1" @@ -14,11 +14,11 @@ EXTRANATIVEPATH += "tar-native" IMAGE_FEATURES += "ssh-server-openssh" # enforce copy of xattrs (to be removed, see SPEC-475) -PACKAGECONFIG_append_pn-shadow = " attr" -PACKAGECONFIG_append_pn-shadow-native = " attr" +PACKAGECONFIG:append:pn-shadow = " attr" +PACKAGECONFIG:append:pn-shadow-native = " attr" # set the home directory for root ROOT_HOME = "/home/0" # include devel wgts in images -IMAGE_FEATURES_append = " agl-devel-wgt" +IMAGE_FEATURES:append = " agl-devel-wgt" diff --git a/meta-app-framework/conf/include/agl-sign-wgts.inc b/meta-app-framework/conf/include/agl-sign-wgts.inc index d56c01288..06a7abac0 100644 --- a/meta-app-framework/conf/include/agl-sign-wgts.inc +++ b/meta-app-framework/conf/include/agl-sign-wgts.inc @@ -1,3 +1,3 @@ # allows insertion of code or items specific to developement OVERRIDES .= ":agl-sign-wgts" -AGL_FEATURES_append = " agl-sign-wgts" +AGL_FEATURES:append = " agl-sign-wgts" -- cgit 1.2.3-korg