summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-11-11 13:41:04 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2016-11-11 13:41:04 +0000
commitc6dc00918d53295b65a31f06b849984ca6907a40 (patch)
treefe13f27bdc9d98eede3298dba04885b3f239cd39
parentee3a799109f2a611bc2a802e6d39eaf87853da3b (diff)
parent8a2f055e3c1ed5a8a96306af51f1d1254c1d47f2 (diff)
Merge "agl-demo: Add iotivity-resource-samples from meta-oic"
-rw-r--r--templates/feature/agl-demo/50_bblayers.conf.inc1
-rw-r--r--templates/feature/agl-demo/50_local.conf.inc3
2 files changed, 4 insertions, 0 deletions
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index 07c20d3..7f04f69 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -7,6 +7,7 @@ BBLAYERS =+ " \
# 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
index 6d1ce9f..9116f40 100644
--- a/templates/feature/agl-demo/50_local.conf.inc
+++ b/templates/feature/agl-demo/50_local.conf.inc
@@ -9,3 +9,6 @@ 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 "