SPEC-3723: restructure meta-agl-demo

All demo related components should be in here now.

We keep the packagegroups on purpose for now to stay backward-compatible.

v2: layer does pass yocto-check-layer, dependencies adapted
v3: remove the dynamic-layer setup, use all-in-one approach
v4: Fixed comments from Paul Barker. Tnx!
v5: Removed wayland/weston/agl-compositor additions, except for demo
    specific weston-init bbappend

Follow-up changes required later:
      - massaging packagegroups
      - scrub of recipes

Bug-AGL: SPEC-3723

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8

12 files changed, 21 insertions, 27 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
new file mode 100644
index 000000000..f15acf66e
--- /dev/null
+++ b/templates/feature/agl-cluster-demo-preload/50_local.conf.inc
@@ -0,0 +1,2 @@
+#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
new file mode 100644
index 000000000..bfb210867
--- /dev/null
+++ b/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 000000000..90b0380d4
--- /dev/null
+++ b/templates/feature/agl-cluster-demo/50_local.conf.inc
@@ -0,0 +1,2 @@
+#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
new file mode 100644
index 000000000..82639da07
--- /dev/null
+++ b/templates/feature/agl-cluster-demo/included.dep
@@ -0,0 +1 @@
+agl-demo
diff --git a/templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc b/templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc
deleted file mode 100644
index 7e85c574e..000000000
--- a/templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# This layer contains the WIP feature/demo code only
-#---------------------------------------------------
-BBLAYERS =+ " \
-   ${METADIR}/meta-agl-demo \
-"
diff --git a/templates/feature/agl-demo-soundmanager/50_local.conf.inc b/templates/feature/agl-demo-soundmanager/50_local.conf.inc
deleted file mode 100644
index 76626243c..000000000
--- a/templates/feature/agl-demo-soundmanager/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl-demo/conf/include/agl-demo.inc
-require conf/include/agl-demo.inc
diff --git a/templates/feature/agl-demo-soundmanager/README_feature_agl-demo-soundmanager.md b/templates/feature/agl-demo-soundmanager/README_feature_agl-demo-soundmanager.md
deleted file mode 100644
index 28feb6eb6..000000000
--- a/templates/feature/agl-demo-soundmanager/README_feature_agl-demo-soundmanager.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-description: Feature agl-demo-soundmanager
-authors: Stephane Desneux <stephane.desneux@iot.bzh>
----
-	
-### Feature agl-demo-soundmanager
-	 
-*Description is missing - please complete file meta-agl-demo/templates/feature/agl-demo-soundmanager/README_feature_agl-demo-soundmanager.md*
-
-#### Dependent features pulled by agl-demo-soundmanager
-
-The following features are pulled:
-
-* agl-appfw-smack
-* agl-hmi-framework
-* agl-profile-graphical-qt5
-* agl-audio-soundmanager-framework
-
diff --git a/templates/feature/agl-demo-soundmanager/included.dep b/templates/feature/agl-demo-soundmanager/included.dep
deleted file mode 100644
index b0b942853..000000000
--- a/templates/feature/agl-demo-soundmanager/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-appfw-smack agl-hmi-framework agl-profile-graphical-qt5 agl-audio-soundmanager-framework
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index afa14f238..55917ccbb 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -8,4 +8,7 @@ BBLAYERS =+ " \
 #---------------------------------------------------
 BBLAYERS =+ " \
    ${METADIR}/external/meta-iot-cloud \
+   ${METADIR}/external/meta-qt5 \
+   ${METADIR}/external/meta-openembedded/meta-filesystems \
+   ${METADIR}/external/meta-python2 \
 "
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
index cbf86e8df..14507678f 100644
--- a/templates/feature/agl-demo/included.dep
+++ b/templates/feature/agl-demo/included.dep
@@ -1 +1 @@
-agl-appfw-smack agl-hmi-framework agl-profile-graphical-qt5 agl-pipewire agl-speech-framework
+agl-appfw-smack agl-hmi-framework agl-pipewire
diff --git a/templates/feature/agl-telematics-demo/50_local.conf.inc b/templates/feature/agl-telematics-demo/50_local.conf.inc
new file mode 100644
index 000000000..64c8714bb
--- /dev/null
+++ b/templates/feature/agl-telematics-demo/50_local.conf.inc
@@ -0,0 +1,2 @@
+#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
new file mode 100644
index 000000000..92798cdc9
--- /dev/null
+++ b/templates/feature/agl-telematics-demo/included.dep
@@ -0,0 +1 @@
+agl-demo
\ No newline at end of file