From d468ce3b3d602f7c8a88d67126a32900b76fd433 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Mon, 18 Oct 2021 14:07:53 +0200 Subject: Prepare master for new framework integration During the last workshop the transition to the new framework was presented. This change essentially deprecates the SMACK-based application framework. To prepare the integration of it, we remove the deprecated components: - meta-agl-core: remove Smack kernel patches - meta-app-framework - meta-pipewire/dynamic-layers/meta-app-framework/ v2: rebased Bug-AGL: SPEC-4121 Signed-off-by: Jan-Simon Moeller Change-Id: Icdaeadfb5d2193f3a4c535168c88da6073423e67 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26752 --- .../conf/include/agl-appfw-smack.inc | 24 ---------------- meta-app-framework/conf/include/agl-sign-wgts.inc | 3 -- meta-app-framework/conf/layer.conf | 33 ---------------------- 3 files changed, 60 deletions(-) delete mode 100644 meta-app-framework/conf/include/agl-appfw-smack.inc delete mode 100644 meta-app-framework/conf/include/agl-sign-wgts.inc delete mode 100644 meta-app-framework/conf/layer.conf (limited to 'meta-app-framework/conf') diff --git a/meta-app-framework/conf/include/agl-appfw-smack.inc b/meta-app-framework/conf/include/agl-appfw-smack.inc deleted file mode 100644 index f22fe715c..000000000 --- a/meta-app-framework/conf/include/agl-appfw-smack.inc +++ /dev/null @@ -1,24 +0,0 @@ -# enable security features (smack, cynagora) - required by Application Framework -OVERRIDES .= ":with-lsm-smack" -DISTRO_FEATURES:append = " smack xattr" -DISTRO_FEATURES_NATIVE:append = " smack xattr" - -APPFW_ENABLED = "1" - -# use tar-native to support SMACK extended attributes independently of host config -IMAGE_CMD_TAR = "tar --xattrs --xattrs-include='*'" -do_image_tar[depends] += "tar-replacement-native:do_populate_sysroot" -EXTRANATIVEPATH += "tar-native" - -# security: enable ssh server in place of dropbear to support PAM on user sessions -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" - -# set the home directory for root -ROOT_HOME = "/home/0" - -# include devel wgts in images -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 deleted file mode 100644 index 06a7abac0..000000000 --- a/meta-app-framework/conf/include/agl-sign-wgts.inc +++ /dev/null @@ -1,3 +0,0 @@ -# allows insertion of code or items specific to developement -OVERRIDES .= ":agl-sign-wgts" -AGL_FEATURES:append = " agl-sign-wgts" diff --git a/meta-app-framework/conf/layer.conf b/meta-app-framework/conf/layer.conf deleted file mode 100644 index 77701bb57..000000000 --- a/meta-app-framework/conf/layer.conf +++ /dev/null @@ -1,33 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "app-framework" -BBFILE_PATTERN_app-framework = "^${LAYERDIR}/" -BBFILE_PRIORITY_app-framework = "70" - -LAYERSERIES_COMPAT_app-framework = "dunfell" - -# dependency: meta-oe -LAYERDEPENDS_app-framework = "openembedded-layer" -# dependency: meta-security -LAYERDEPENDS_app-framework += "security" - -# AGL core layer is an optional requirement -LAYERRECOMMENDS_app-framework += "aglcore" -LAYERRECOMMENDS_app-framework += "qt5-layer" - -BBFILES_DYNAMIC += " \ - qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bb \ - qt5-layer:${LAYERDIR}/dynamic-layers/meta-qt5/*/*/*.bbappend \ - aglcore:${LAYERDIR}/dynamic-layers/meta-agl-core/*/*/*.bb \ - aglcore:${LAYERDIR}/dynamic-layers/meta-agl-core/*/*/*.bbappend \ -" - - -# bug in meta-security -BBMASK += "packagegroup-core-security-ptest\.bb" -#BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb -- cgit 1.2.3-korg