summaryrefslogtreecommitdiffstats
path: root/meta-app-framework/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-app-framework/conf')
-rw-r--r--meta-app-framework/conf/include/agl-app-framework.inc2
-rw-r--r--meta-app-framework/conf/include/agl-appfw-smack.inc19
-rw-r--r--meta-app-framework/conf/layer.conf9
3 files changed, 7 insertions, 23 deletions
diff --git a/meta-app-framework/conf/include/agl-app-framework.inc b/meta-app-framework/conf/include/agl-app-framework.inc
new file mode 100644
index 000000000..296f49e79
--- /dev/null
+++ b/meta-app-framework/conf/include/agl-app-framework.inc
@@ -0,0 +1,2 @@
+# enable the layer
+AGL_FEATURES:append = " agl-app-fw"
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 139722402..000000000
--- a/meta-app-framework/conf/include/agl-appfw-smack.inc
+++ /dev/null
@@ -1,19 +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"
-
-# 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"
diff --git a/meta-app-framework/conf/layer.conf b/meta-app-framework/conf/layer.conf
index 21b8ee530..0fe82784b 100644
--- a/meta-app-framework/conf/layer.conf
+++ b/meta-app-framework/conf/layer.conf
@@ -5,8 +5,9 @@ BBPATH .= ":${LAYERDIR}"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
-BBFILE_COLLECTIONS += "app-framework"
-BBFILE_PATTERN_app-framework = "^${LAYERDIR}/"
-BBFILE_PRIORITY_app-framework = "70"
+BBFILE_COLLECTIONS += "meta-app-framework"
+BBFILE_PATTERN_meta-app-framework = "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-app-framework = "60"
-LAYERSERIES_COMPAT_app-framework = "dunfell"
+LAYERSERIES_COMPAT_meta-app-framework = "scarthgap"
+LAYERDEPENDS_meta-app-framework = "core aglcore openembedded-layer"