From 41591d4f8c586aa801220fac0924556f406c58bd Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 8 Dec 2020 11:15:02 +0100 Subject: 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 Signed-off-by: Scott Murray Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8 --- .../feature/agl-cluster-demo-preload/50_local.conf.inc | 2 ++ .../README_feature_agl-cluster-demo-preload.md | 9 +++++++++ templates/feature/agl-cluster-demo/50_local.conf.inc | 2 ++ templates/feature/agl-cluster-demo/included.dep | 1 + .../feature/agl-demo-soundmanager/50_bblayers.conf.inc | 5 ----- .../feature/agl-demo-soundmanager/50_local.conf.inc | 2 -- .../README_feature_agl-demo-soundmanager.md | 18 ------------------ templates/feature/agl-demo-soundmanager/included.dep | 1 - templates/feature/agl-demo/50_bblayers.conf.inc | 3 +++ templates/feature/agl-demo/included.dep | 2 +- .../feature/agl-telematics-demo/50_local.conf.inc | 2 ++ templates/feature/agl-telematics-demo/included.dep | 1 + 12 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 templates/feature/agl-cluster-demo-preload/50_local.conf.inc create mode 100644 templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md create mode 100644 templates/feature/agl-cluster-demo/50_local.conf.inc create mode 100644 templates/feature/agl-cluster-demo/included.dep delete mode 100644 templates/feature/agl-demo-soundmanager/50_bblayers.conf.inc delete mode 100644 templates/feature/agl-demo-soundmanager/50_local.conf.inc delete mode 100644 templates/feature/agl-demo-soundmanager/README_feature_agl-demo-soundmanager.md delete mode 100644 templates/feature/agl-demo-soundmanager/included.dep create mode 100644 templates/feature/agl-telematics-demo/50_local.conf.inc create mode 100644 templates/feature/agl-telematics-demo/included.dep (limited to 'templates') 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 00000000..f15acf66 --- /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 00000000..bfb21086 --- /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 +--- + +### 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 00000000..90b0380d --- /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 00000000..82639da0 --- /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 7e85c574..00000000 --- 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 76626243..00000000 --- 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 28feb6eb..00000000 --- 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 ---- - -### 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 b0b94285..00000000 --- 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 afa14f23..55917ccb 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 cbf86e8d..14507678 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 00000000..64c8714b --- /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 00000000..92798cdc --- /dev/null +++ b/templates/feature/agl-telematics-demo/included.dep @@ -0,0 +1 @@ +agl-demo \ No newline at end of file -- cgit 1.2.3-korg