Make boot2qt demos excludable

Previously all demos were installed for each device and individual
demo could be excluded from the launcher list for a particual device.
The exclude list was part of the demo sources, which makes it hard
to maintain.

Move all demos to individual recipes which can be included and excluded
separately for each target based on its capabilities by modifying the
BOOT2QT_DEMOS variable. By default include all currently supported demos.

Task-number: QTBUG-74930
Change-Id: I31dfaa101d85b9cf7339a8180706867a5ba5bfb6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>

9 files changed, 27 insertions, 2 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
index 4719b4c7..d0e6ee62 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -44,6 +44,8 @@ PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
index 7bfb388c..7ab090aa 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7-emmc.conf
@@ -44,5 +44,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index c7aa169f..f3f59ec5 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -44,5 +44,7 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 # try to limit the maximum size of the tezi image
 RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
index ecd01dab..dab6b814 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-vf.conf
@@ -41,3 +41,5 @@ PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
+
+BOOT2QT_DEMOS_remove = "boot2qt-demo-qtgraphicaleffects boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
index bcd4f7f8..eeba4a50 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
@@ -38,4 +38,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-warp7"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
+
 KERNEL_DEVICETREE = "imx7d-warp.dtb"
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
index 0d225fa1..f8e2b128 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen7.conf
@@ -36,3 +36,4 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-qtgraphicaleffects boot2qt-demo-qtwebbrowser"
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
index 4429fa98..558efe87 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.conf
@@ -33,5 +33,7 @@ DEPLOY_CONF_NAME = "Raspberry Pi"
 
 DISTRO_FEATURES_remove = "webengine"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser"
+
 # additional memory for GPU
 GPU_MEM = "128"
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
index 647e5973..4adb9958 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi0.conf
@@ -33,5 +33,7 @@ DEPLOY_CONF_NAME = "Raspberry Pi Zero"
 
 DISTRO_FEATURES_remove = "webengine"
 
+BOOT2QT_DEMOS_remove = "boot2qt-demo-mediaplayer boot2qt-demo-qtwebbrowser"
+
 # additional memory for GPU
 GPU_MEM = "128"
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 2e46a323..33cb22b7 100644
--- a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -34,10 +34,20 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+BOOT2QT_DEMOS ?= "\
+    boot2qt-demo-ebike \
+    boot2qt-demo-mediaplayer \
+    boot2qt-demo-qtcharts \
+    boot2qt-demo-qtgraphicaleffects \
+    boot2qt-demo-qtquickcontrols2 \
+    boot2qt-demo-qtvirtualkeyboard \
+    ${@bb.utils.contains("DISTRO_FEATURES", "webengine", "boot2qt-demo-qtwebbrowser", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
+    "
+
 RDEPENDS_${PN} += " \
     boot2qt-appcontroller \
     boot2qt-launcher \
-    boot2qt-demos \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
+    ${BOOT2QT_DEMOS} \
     qdb \
     "