summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/include/agl-cloudproxy.inc5
-rw-r--r--conf/include/agl-demo-preload.inc7
-rw-r--r--conf/include/agl-demo.inc13
-rw-r--r--conf/layer.conf2
4 files changed, 2 insertions, 25 deletions
diff --git a/conf/include/agl-cloudproxy.inc b/conf/include/agl-cloudproxy.inc
deleted file mode 100644
index d62e3095f..000000000
--- a/conf/include/agl-cloudproxy.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Mask out recipes with older versions than those available in
-# meta-oe and meta-python
-BBMASK += "meta-iot-cloud/recipes-support/cjson/cjson_1.7.10.bb"
-BBMASK += "meta-iot-cloud/recipes-devtools/python/python3-httplib2_0.11.3.bb"
-BBMASK += "meta-iot-cloud/recipes-devtools/python/python3-xmltodict_0.11.0.bb"
diff --git a/conf/include/agl-demo-preload.inc b/conf/include/agl-demo-preload.inc
index a41168951..b6ae2ae2e 100644
--- a/conf/include/agl-demo-preload.inc
+++ b/conf/include/agl-demo-preload.inc
@@ -1,8 +1 @@
AGL_FEATURES:append = " agl-demo-preload"
-
-# Use demo device mapping for low-can that enables sllin0
-PREFERRED_RPROVIDER_virtual/low-can-dev-mapping = "dev-mapping-demo"
-
-# Extend agl-voiceagent-alexa image feature to preload voiceagent
-# configuration package.
-FEATURE_PACKAGES_agl-voiceagent-alexa:append = " virtual/alexa-voiceagent-config"
diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 99085c183..a47f41d70 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -12,19 +12,8 @@ IMAGE_INSTALL:append = " screen mc "
# individually.
IMAGE_INSTALL:append = " ${@'kernel-modules' if d.getVar('PREFERRED_PROVIDER_virtual/kernel') != 'linux-dummy' else ''}"
-# Extend agl-voiceagent-alexa image feature with local alexa-viewer
-# package.
-FEATURE_PACKAGES_agl-voiceagent-alexa:append = " alexa-viewer"
-
# enable the layer
AGL_FEATURES:append = " agldemo"
-# Set preferred provider for low-can device mapping configuration
-PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'dev-mapping-ci', 'dev-mapping', d)}"
-
-# voice api inclusion
-PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config"
-FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services"
-
# install virtualbox drivers for vmdk
-IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
+#IMAGE_INSTALL:append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic.vmdk.xz', ' open-vm-tools vboxguestdrivers', '', d)}"
diff --git a/conf/layer.conf b/conf/layer.conf
index f9ef8c6f2..e76256434 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,5 +11,5 @@ BBFILE_PRIORITY_agldemo = "70"
LAYERSERIES_COMPAT_agldemo = "dunfell"
-LAYERDEPENDS_agldemo = "aglcore app-framework qt5-layer openembedded-layer"
+LAYERDEPENDS_agldemo = "aglcore qt5-layer openembedded-layer"