summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-01-12 16:41:29 -0500
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-01-13 20:33:53 +0000
commitd7d6c8622195aaf83bd66b53dec231d7b1c30bf1 (patch)
tree47c21ec8d25507f644507e413ce7608370eb9dd2 /templates
parente9ec6a99e6c1549a17d1eb36175fe437f69ce327 (diff)
Remove separate agl-{cluster,telematics}-demo features
Changes: - Remove feature templates and associated include files for the agl-cluster-demo and agl-telematics-demo features. All of the demo images can now be built by just configuring with the agl-demo feature. - Remove feature template for agl-cluster-demo-preload, the cluster demo configuration it was pulling into the cluster image is now driven by the agl-demo-preload feature instead. - Moved speech framework and Alexa voiceagent feature inclusion to agl-demo-platform.inc to avoid them accidentally being pulled into the cluster or telematics demo images. Part of this change is moving agl-voiceagent-alexa from using IMAGE_FEATURES to AGL_FEATURES, which needs a corresponding change to meta-agl-devel. - Remove leftover use of agl-core-image-profile DISTRO_FEATURE, which no longer exists. - Remove unneeded explicit dependency on the PREFERRED_RPROVIDER_virtual/voice-high-config, things seem to be working fine with the dependency from agl-service-voice-high, so it is not required. Bug-AGL: SPEC-3749 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ibcfbce28231a91aa56269db9196c471458d0e928
Diffstat (limited to 'templates')
-rw-r--r--templates/feature/agl-cluster-demo-preload/50_local.conf.inc2
-rw-r--r--templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md9
-rw-r--r--templates/feature/agl-cluster-demo/50_local.conf.inc2
-rw-r--r--templates/feature/agl-cluster-demo/included.dep1
-rw-r--r--templates/feature/agl-telematics-demo/50_local.conf.inc2
-rw-r--r--templates/feature/agl-telematics-demo/included.dep1
6 files changed, 0 insertions, 17 deletions
diff --git a/templates/feature/agl-cluster-demo-preload/50_local.conf.inc b/templates/feature/agl-cluster-demo-preload/50_local.conf.inc
deleted file mode 100644
index f15acf66..00000000
--- a/templates/feature/agl-cluster-demo-preload/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl-cluster-demo/conf/include/agl-cluster-demo-preload.inc
-require conf/include/agl-cluster-demo-preload.inc
diff --git a/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md b/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md
deleted file mode 100644
index bfb21086..00000000
--- a/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Feature agl-cluster-demo-preload
-authors: Scott Murray <scott.murray@konsulko.com>
----
-
-### Feature agl-cluster-demo-preload
-
-*Description is missing - please complete file meta-agl-cluster-demo/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md*
-
diff --git a/templates/feature/agl-cluster-demo/50_local.conf.inc b/templates/feature/agl-cluster-demo/50_local.conf.inc
deleted file mode 100644
index 90b0380d..00000000
--- a/templates/feature/agl-cluster-demo/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl-cluster-demo/conf/include/agl-cluster-demo.inc
-require conf/include/agl-cluster-demo.inc
diff --git a/templates/feature/agl-cluster-demo/included.dep b/templates/feature/agl-cluster-demo/included.dep
deleted file mode 100644
index 82639da0..00000000
--- a/templates/feature/agl-cluster-demo/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-demo
diff --git a/templates/feature/agl-telematics-demo/50_local.conf.inc b/templates/feature/agl-telematics-demo/50_local.conf.inc
deleted file mode 100644
index 64c8714b..00000000
--- a/templates/feature/agl-telematics-demo/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl-telematics-demo/conf/include/agl-telematics-demo.inc
-require conf/include/agl-telematics-demo.inc
diff --git a/templates/feature/agl-telematics-demo/included.dep b/templates/feature/agl-telematics-demo/included.dep
deleted file mode 100644
index 92798cdc..00000000
--- a/templates/feature/agl-telematics-demo/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-demo \ No newline at end of file