summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-11-10 12:51:56 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2016-11-10 12:51:56 +0000
commit6ea6f49bbd0c482abab37f7aa2f22976ef150b6a (patch)
tree4addcb2a296f8ae3364b2e76b61210b2d31d7efb
parent47b5ad2d26c683ad9c5243e422e0a1bbdec4aff9 (diff)
parent88595bab4a423e014ab6a18e7378ef32ef86275a (diff)
Merge "Revert "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, 0 insertions, 4 deletions
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index 7f04f69..07c20d3 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-demo/50_local.conf.inc b/templates/feature/agl-demo/50_local.conf.inc
index 9116f40..6d1ce9f 100644
--- a/templates/feature/agl-demo/50_local.conf.inc
+++ b/templates/feature/agl-demo/50_local.conf.inc
@@ -9,6 +9,3 @@ 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 "