aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan <ronan.lemartret@iot.bzh>2017-01-20 16:20:17 +0100
committerRonan <ronan.lemartret@iot.bzh>2017-01-25 17:16:41 +0100
commit87ce94d22c1bcea17f847fdd0c0c546bcaca7ad2 (patch)
tree6f7dd906443ff9f6b80f8a5f998a56ad8338c4d0
parente9da2ae427ac8631e3f62915850adba4cfcf40ed (diff)
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 Change-Id: Ie4cdfde42424f455181ee4bde8087a9cc746e231 Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
-rw-r--r--conf/include/agl-demo.inc14
-rw-r--r--templates/feature/agl-demo/50_bblayers.conf.inc13
-rw-r--r--templates/feature/agl-demo/50_local.conf.inc2
-rw-r--r--templates/feature/agl-demo/included.dep1
4 files changed, 30 insertions, 0 deletions
diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
new file mode 100644
index 000000000..b831a4433
--- /dev/null
+++ b/conf/include/agl-demo.inc
@@ -0,0 +1,14 @@
+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/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
new file mode 100644
index 000000000..7f04f69e4
--- /dev/null
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -0,0 +1,13 @@
+# 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
new file mode 100644
index 000000000..76626243c
--- /dev/null
+++ b/templates/feature/agl-demo/50_local.conf.inc
@@ -0,0 +1,2 @@
+#see meta-agl-demo/conf/include/agl-demo.inc
+require conf/include/agl-demo.inc
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
new file mode 100644
index 000000000..00568a91b
--- /dev/null
+++ b/templates/feature/agl-demo/included.dep
@@ -0,0 +1 @@
+agl-appfw-smack agl-devel