Add webengine

Update meta-qt6 layer which includes new recipe for QtWebEngine.
It's included in the image when webengine DISTRO_FEATURE is available.
Remove from machines without gpu, since it currently won't build without
opengl enabled in qtbase.

Enable gold linker, it has better performance and avoids errors that can
occur with bfd when linking webengine..

Chromium depends on python2 for the build, add the new meta layer to
manifest and the default bblayer.confs.

Task-number: QTBUG-93825
Change-Id: I86cee372188a97dc2bf7b65d337425788725257b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

9 files changed, 14 insertions, 3 deletions

diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
index fadd0cab..b7fd9841 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
@@ -45,6 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-python2 \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
index 4d81cc33..d040a77c 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
@@ -44,6 +44,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-python2 \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
index 9f097770..f3921fa2 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
@@ -45,6 +45,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-python2 \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
index 07731e6b..3d07950d 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
@@ -44,6 +44,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-python2 \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.sample b/meta-boot2qt-distro/conf/bblayers.conf.sample
index 6ceb29dd..44cd1e31 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.sample
@@ -43,6 +43,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-python2 \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
index 4518b05b..b713f05c 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
@@ -47,6 +47,7 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-openembedded/meta-networking \
   ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-python2 \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
   ${BSPDIR}/sources/meta-mingw \
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index 2da55a79..3d3bd030 100644
--- a/meta-boot2qt-distro/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -52,7 +52,7 @@ DISTRO_FEATURES_FILTER_NATIVESDK_append = " wayland"
 
 FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
 
-DISTRO_FEATURES += "gstreamer webengine systemd pam"
+DISTRO_FEATURES += "gstreamer webengine systemd pam ld-is-gold"
 
 INIT_MANAGER = "systemd"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index d8fe479d..02517d59 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -54,7 +54,7 @@ IMX_BOOT_SOC_TARGET_mx8x = "iMX8QX"
 IMX_BOOT_SOC_TARGET_mx8mm = "iMX8MM"
 IMX_BOOT_SOC_TARGET_mx8mp = "iMX8MP"
 
-GPULESS_FEATURES = "wayland opengl vulkan"
+GPULESS_FEATURES = "wayland opengl vulkan webengine"
 GPULESS_FEATURES_imxgpu = ""
 DISTRO_FEATURES_remove = "${GPULESS_FEATURES}"
 
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 74aa06b2..ec24ecc6 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -24,6 +24,11 @@
            revision="aaa1c12b2cdea197d420953c8df873e8af5cc507"
            upstream="hardknott"
            path="sources/meta-openembedded"/>
+  <project name="meta-python2"
+           remote="oe"
+           revision="810d6d842f103eb59f18b06426106462b15de7e2"
+           upsream="hardknott"
+           path="sources/meta-python2"/>
 
   <!-- Qt -->
   <remote name="qt"
@@ -33,7 +38,7 @@
           fetch="ssh://codereview.qt-project.org/yocto"/>
   <project name="meta-qt6"
            remote="qt"
-           revision="6ce601a4d55a5e61f97e34cda7cce860a61e6ffb"
+           revision="7f83b930828419c75ccff66e72776d695cc1f79d"
            upstream="6.2"
            path="sources/meta-qt6"/>