From: Philippe Coval <philippe.coval@osg.samsung.com>
Date: Tue, 31 Jan 2017 17:15:51 +0000 (+0100)
Subject: iotivity: Migrate from agl-demo to agl-iotivity feature
X-Git-Tag: 3.99.1~32
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=947ac6fbb51ab30082d4ded359fece6a94020243

iotivity: Migrate from agl-demo to agl-iotivity feature

Ship packagegroup-iotivity from meta-oic
 to take extra libs instead of just iotivity-examples.

For convenience, screen remains as part agl-demo.

For more details about OCF support check:
https://wiki.iotivity.org/automotive

Bug-AGL: SPEC-158

Change-Id: I1ba476889e68da3bb010753b3c19d7d9b581b30b
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
---

diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index b831a4433..dace0e19e 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -10,5 +10,4 @@ IMAGE_INSTALL_append = " qtwebkit qtwebkit-examples-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
index 7f04f69e4..07c20d3aa 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -7,7 +7,6 @@ BBLAYERS =+ " \
 # These are the dependencies of the AGL DEMO Layer
 #-------------------------------------------------
 BBLAYERS =+ " \
-   ${METADIR}/meta-oic \
    ${METADIR}/meta-qt5 \
 "
 
diff --git a/templates/feature/agl-iotivity/50_bblayers.conf.inc b/templates/feature/agl-iotivity/50_bblayers.conf.inc
new file mode 100644
index 000000000..bcb7d1060
--- /dev/null
+++ b/templates/feature/agl-iotivity/50_bblayers.conf.inc
@@ -0,0 +1 @@
+BBLAYERS =+ " ${METADIR}/meta-oic"
diff --git a/templates/feature/agl-iotivity/50_local.conf.inc b/templates/feature/agl-iotivity/50_local.conf.inc
new file mode 100644
index 000000000..63d9eaab3
--- /dev/null
+++ b/templates/feature/agl-iotivity/50_local.conf.inc
@@ -0,0 +1,2 @@
+IMAGE_INSTALL_append = " packagegroup-iotivity"
+IMAGE_INSTALL_append = " screen"