6 files changed, 23 insertions, 7 deletions
diff --git a/conf/include/agl-cluster-demo-preload.inc b/conf/include/agl-cluster-demo-preload.inc
new file mode 100644
index 000000000..70421e8cf
--- /dev/null
+++ b/conf/include/agl-cluster-demo-preload.inc
@@ -0,0 +1 @@
+AGL_FEATURES_append = " agl-cluster-demo-preload"
diff --git a/conf/include/agl-cluster-demo.inc b/conf/include/agl-cluster-demo.inc
new file mode 100644
index 000000000..a8847e071
--- /dev/null
+++ b/conf/include/agl-cluster-demo.inc
@@ -0,0 +1,5 @@
+IMAGE_FEATURES =+ "debug-tweaks"
+
+#DISTRO_FEATURES_append = " "
+
+#IMAGE_INSTALL_append = " "
diff --git a/conf/include/agl-demo-preload.inc b/conf/include/agl-demo-preload.inc
index da46810b9..484bc0578 100644
--- a/conf/include/agl-demo-preload.inc
+++ b/conf/include/agl-demo-preload.inc
@@ -1,4 +1,4 @@
-DISTRO_FEATURES_append = " agl-demo-preload"
+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"
diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc
index 32d447af3..390f47ea8 100644
--- a/conf/include/agl-demo.inc
+++ b/conf/include/agl-demo.inc
@@ -1,11 +1,13 @@
 IMAGE_FEATURES =+ "debug-tweaks"
 
-# disable the webruntime
-#DISTRO_FEATURES_append = " webruntime "
 DISTRO_FEATURES_append = " automount "
 
+# convenience
 IMAGE_INSTALL_append = " screen mc "
 
 # 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"
diff --git a/conf/include/agl-telematics-demo.inc b/conf/include/agl-telematics-demo.inc
new file mode 100644
index 000000000..a8847e071
--- /dev/null
+++ b/conf/include/agl-telematics-demo.inc
@@ -0,0 +1,5 @@
+IMAGE_FEATURES =+ "debug-tweaks"
+
+#DISTRO_FEATURES_append = " "
+
+#IMAGE_INSTALL_append = " "
diff --git a/conf/layer.conf b/conf/layer.conf
index 7da7ac0d2..f9ef8c6f2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,8 +5,11 @@ BBPATH =. "${LAYERDIR}:"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "agl-demo"
-BBFILE_PATTERN_agl-demo = "^${LAYERDIR}/"
-BBFILE_PRIORITY_agl-demo = "7"
+BBFILE_COLLECTIONS += "agldemo"
+BBFILE_PATTERN_agldemo = "^${LAYERDIR}/"
+BBFILE_PRIORITY_agldemo = "70"
+
+LAYERSERIES_COMPAT_agldemo = "dunfell"
+
+LAYERDEPENDS_agldemo = "aglcore app-framework qt5-layer openembedded-layer"
 
-LAYERSERIES_COMPAT_agl-demo = "dunfell"