diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-12-08 11:15:02 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-12-17 13:58:05 +0000 |
| commit | 41591d4f8c586aa801220fac0924556f406c58bd (patch) | |
| tree | 85a2803d48a094fb0ba3a76b9e3d0870a4e5edc2 /conf | |
| parent | 4830bcef14e7f49cdc851c646a69c9bb9bd92e82 (diff) | |
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
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/include/agl-cluster-demo-preload.inc | 1 | ||||
| -rw-r--r-- | conf/include/agl-cluster-demo.inc | 5 | ||||
| -rw-r--r-- | conf/include/agl-demo-preload.inc | 2 | ||||
| -rw-r--r-- | conf/include/agl-demo.inc | 6 | ||||
| -rw-r--r-- | conf/include/agl-telematics-demo.inc | 5 | ||||
| -rw-r--r-- | conf/layer.conf | 11 |
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 00000000..70421e8c --- /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 00000000..a8847e07 --- /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 da46810b..484bc057 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 32d447af..390f47ea 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 00000000..a8847e07 --- /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 7da7ac0d..f9ef8c6f 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" |