Add docker/container runtime

Add meta-virtualization layer and DISTRO_FEATURE virtualization for
docker/container. Virtualization is not needed in all cases and it
also increases image size (~10%) so supported targets are filtered
by webengine support, at least initially.

Change-Id: I90e6a0f4f127065aa02a64e33648e51a1cf6a8c2
Task-number: QTBUG-122186
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

8 files changed, 15 insertions, 4 deletions

diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index a3c51a4b..0fdf3914 100644
--- a/meta-boot2qt-distro/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -53,9 +53,9 @@ DISTRO_FEATURES_FILTER_NATIVESDK:append = " wayland"
 
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 
-DISTRO_FEATURES += "gstreamer webengine systemd pam"
-DISTRO_FEATURES:remove:mipsarch = "webengine"
-DISTRO_FEATURES:remove:riscv64 = "webengine"
+DISTRO_FEATURES += "gstreamer webengine systemd pam virtualization"
+DISTRO_FEATURES:remove:mipsarch = "webengine virtualization"
+DISTRO_FEATURES:remove:riscv64 = "webengine virtualization"
 
 INIT_MANAGER = "systemd"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/imx.inc b/meta-boot2qt-distro/conf/distro/include/imx.inc
index cc3a79ad..cabe2bc3 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx.inc
+++ b/meta-boot2qt-distro/conf/distro/include/imx.inc
@@ -40,7 +40,7 @@ QBSP_IMAGE_CONTENT += "\
 QBSP_LICENSE_FILE ?= "${FSL_EULA_FILE}"
 QBSP_LICENSE_NAME ?= "NXP Semiconductors Software License Agreement"
 
-GPULESS_FEATURES = "wayland opengl vulkan webengine"
+GPULESS_FEATURES = "wayland opengl vulkan webengine virtualization"
 DISTRO_FEATURES:remove:mx6ul-generic-bsp = "${GPULESS_FEATURES}"
 DISTRO_FEATURES:remove:mx7-generic-bsp = "${GPULESS_FEATURES}"
 DISTRO_FEATURES:remove:mx93-generic-bsp = "${GPULESS_FEATURES}"
diff --git a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.fsl.sample
index fadd0cab..18f6ffe7 100644
--- a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.fsl.sample
+++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.fsl.sample
@@ -45,6 +45,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-openembedded/meta-filesystems \
+  ${BSPDIR}/sources/meta-virtualization \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.intel.sample
index 4d81cc33..665562cd 100644
--- a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.intel.sample
+++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.intel.sample
@@ -44,6 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-openembedded/meta-filesystems \
+  ${BSPDIR}/sources/meta-virtualization \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.jetson.sample
index 50d7d928..9e7eaf16 100644
--- a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.jetson.sample
+++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.jetson.sample
@@ -44,6 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-openembedded/meta-filesystems \
+  ${BSPDIR}/sources/meta-virtualization \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.rpi.sample
index 07731e6b..18b444db 100644
--- a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.rpi.sample
+++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.rpi.sample
@@ -44,6 +44,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-openembedded/meta-filesystems \
+  ${BSPDIR}/sources/meta-virtualization \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.sample b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.sample
index 6ceb29dd..1ad53656 100644
--- a/meta-boot2qt-distro/conf/templates/default/bblayers.conf.sample
+++ b/meta-boot2qt-distro/conf/templates/default/bblayers.conf.sample
@@ -43,6 +43,8 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-openembedded/meta-filesystems \
+  ${BSPDIR}/sources/meta-virtualization \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb
index c6a6aa4e..cb2b8a78 100644
--- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb
@@ -54,4 +54,5 @@ IMAGE_INSTALL += "\
     ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
     packagegroup-qt6-modules \
     packagegroup-b2qt-embedded-addons \
+    ${@bb.utils.contains("DISTRO_FEATURES", "virtualization", "packagegroup-docker", "", d)} \
     "