Move feature code into the meta recipes

 * Having a minimlal local.conf serving the only purpose
   of user customization is the "Yocto" way of doing things

 * After a source synchronization (repo  sync), feature code
   must be update without regenerate local.conf

 * move feature/agl-demo to meta-agl-demo

Change-Id: I6db3956da8091bf583b20fce7dc184bfe622a85a
Signed-off-by: Ronan <ronan.lemartret@iot.bzh>

7 files changed, 31 insertions, 55 deletions

diff --git a/meta-app-framework/conf/include/agl-appfw-smack.inc b/meta-app-framework/conf/include/agl-appfw-smack.inc
new file mode 100644
index 0000000..90862cb
--- /dev/null
+++ b/meta-app-framework/conf/include/agl-appfw-smack.inc
@@ -0,0 +1,12 @@
+# enable security features (smack, cynara) - required by Application Framework
+OVERRIDES .= ":smack"
+DISTRO_FEATURES_append = " smack dbus-cynara"
+
+# use tar-native to support SMACK extended attributes independently of host config
+IMAGE_CMD_TAR = "tar --xattrs-include='*'"
+IMAGE_DEPENDS_tar_append = " tar-replacement-native"
+EXTRANATIVEPATH += "tar-native"
+
+# security: enable ssh server in place of dropbear to support PAM on user sessions
+IMAGE_FEATURES += "ssh-server-openssh"
+
diff --git a/meta-sota/conf/include/agl-sota.inc b/meta-sota/conf/include/agl-sota.inc
new file mode 100644
index 0000000..4960e1a
--- /dev/null
+++ b/meta-sota/conf/include/agl-sota.inc
@@ -0,0 +1,15 @@
+DISTRO_FEATURES_append = " agl-ota"
+OVERRIDES .= ":sota"
+
+IMAGE_INSTALL_append = " ostree"
+
+# live image for OSTree-enabled systems
+IMAGE_CLASSES += "image_types_ostree image_types_ota"
+IMAGE_FSTYPES += "ostreepush otaimg"
+
+# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
+OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
+OSTREE_BRANCHNAME ?= "agl-ota-${MACHINE}"
+OSTREE_OSNAME ?= "agl"
+OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
+
diff --git a/templates/feature/agl-appfw-smack/50_local.conf.inc b/templates/feature/agl-appfw-smack/50_local.conf.inc
index 90862cb..add62a3 100644
--- a/templates/feature/agl-appfw-smack/50_local.conf.inc
+++ b/templates/feature/agl-appfw-smack/50_local.conf.inc
@@ -1,12 +1,2 @@
-# enable security features (smack, cynara) - required by Application Framework
-OVERRIDES .= ":smack"
-DISTRO_FEATURES_append = " smack dbus-cynara"
-
-# use tar-native to support SMACK extended attributes independently of host config
-IMAGE_CMD_TAR = "tar --xattrs-include='*'"
-IMAGE_DEPENDS_tar_append = " tar-replacement-native"
-EXTRANATIVEPATH += "tar-native"
-
-# security: enable ssh server in place of dropbear to support PAM on user sessions
-IMAGE_FEATURES += "ssh-server-openssh"
-
+#see meta-agl-extra/meta-app-framework/conf/include/agl-appfw-smack.inc
+require conf/include/agl-appfw-smack.inc
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
deleted file mode 100644
index 7f04f69..0000000
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# This layer contains the WIP feature/demo code only
-#---------------------------------------------------
-BBLAYERS =+ " \
-   ${METADIR}/meta-agl-demo \
-"
-
-# These are the dependencies of the AGL DEMO Layer
-#-------------------------------------------------
-BBLAYERS =+ " \
-   ${METADIR}/meta-oic \
-   ${METADIR}/meta-qt5 \
-"
-
diff --git a/templates/feature/agl-demo/50_local.conf.inc b/templates/feature/agl-demo/50_local.conf.inc
deleted file mode 100644
index 9116f40..0000000
--- a/templates/feature/agl-demo/50_local.conf.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EXTRA_IMAGE_FEATURES =+ "debug-tweaks"
-
-DISTRO_FEATURES_append = " AGL_WEBRUNTIME "
-
-# Add webkit as workaround as webengine is broken right now
-IMAGE_INSTALL_append = " qtwebkit qtwebkit-examples-examples"
-#IMAGE_INSTALL_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles"
-#IMAGE_INSTALL_append = " qtwebengine-examples"
-
-# add support for websocket in Qt and QML
-IMAGE_INSTALL_append = " qtwebsockets qtwebsockets-qmlplugins"
-
-IMAGE_INSTALL_append = " iotivity-resource-samples "
-IMAGE_INSTALL_append = " screen "
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
deleted file mode 100644
index 00568a9..0000000
--- a/templates/feature/agl-demo/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-appfw-smack agl-devel 
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 4960e1a..b361016 100644
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,15 +1,2 @@
-DISTRO_FEATURES_append = " agl-ota"
-OVERRIDES .= ":sota"
-
-IMAGE_INSTALL_append = " ostree"
-
-# live image for OSTree-enabled systems
-IMAGE_CLASSES += "image_types_ostree image_types_ota"
-IMAGE_FSTYPES += "ostreepush otaimg"
-
-# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
-OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
-OSTREE_BRANCHNAME ?= "agl-ota-${MACHINE}"
-OSTREE_OSNAME ?= "agl"
-OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
-
+#see meta-agl-extra/meta-sota/conf/include/agl-sota.inc
+require conf/include/agl-sota.inc