aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-12-31 15:48:23 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2022-01-03 12:05:44 +0200
commit7f88dff06c54e255cd3fb140fb06e426ff408198 (patch)
treeecb0f9894f3bd78145739a84b9684f45bfa6a1d9
parent980425028e4aabaff1fe0fe898bc81e290bc4e3e (diff)
meta-qt6: update meta layer revisionv6.3.0-alpha
Latest revision has QtWebEngine that can be built without python2. Remove all references to the meta layer as it's no longer needed. Changelog for meta-qt6: 850937d qtwebengine: update to 94-based chromium 0a797d9 README.md: update CI test build matrix da80b30 qt6-git.inc: change default branch dev -> 6.3 b721265 qtbase: add patch to fix declarative build issue dd5a54b Update license checksums bdc0881 qt6: update submodules 61792ec Update Qt Commercial license 68ff18d Add QtPDF 66e6245 qt6-qmake: use the OE_QMAKE bindir and libexecdir 08cf601 qtbase: fix PACKAGECONFIG for PostgreSQL 4b933aa Revert "Coin: add required zstd" e8eb19e sdk: support additional build scripts from qtbase 04b94d8 qtbase: add missing packageconfigs 4998ce7 sdk: include nativesdk-qtserialbus-tools 3cf6111 qtquickdesigner-components: update module 6b7208c sdk: don't append the first line to qt.conf 002b2ce sdk: fix compiler location for QT6_INSTALL_BINDIR != bindir d809311 qmlcompiler: add all needed packages to host SDK 16be613 Use correct domain for yocto-cache 01d90c1 qmlcompiler: disable by default 95fa269 Workaround too eager packagegroup sanity check 433dfd4 qmlcompiler: update supported modules 8fe8c84 qmlcompilerplus: update checksum f7fd11b qtspeech: remove recipe 152d0e6 Update submodule refs on 'dev' in yocto/meta-qt6 3bb7677 qtbase-native: don't try to find tools d0e7002 Add QML Script Compiler Change-Id: I352650ad0a93931557152144b5a1c0f3dcab0cc2 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 57d3482327c2069dad60232e5ec2961fbbd3b6bf) Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--meta-boot2qt-distro/conf/bblayers.conf.fsl.sample1
-rw-r--r--meta-boot2qt-distro/conf/bblayers.conf.intel.sample1
-rw-r--r--meta-boot2qt-distro/conf/bblayers.conf.jetson.sample1
-rw-r--r--meta-boot2qt-distro/conf/bblayers.conf.rpi.sample1
-rw-r--r--meta-boot2qt-distro/conf/bblayers.conf.sample1
-rw-r--r--meta-boot2qt-distro/conf/bblayers.conf.toradex.sample1
-rw-r--r--scripts/manifest.xml7
7 files changed, 1 insertions, 12 deletions
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
index b7fd9841..fadd0cab 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.fsl.sample
@@ -45,7 +45,6 @@ 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 d040a77c..4d81cc33 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.intel.sample
@@ -44,7 +44,6 @@ 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 f3921fa2..9f097770 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.jetson.sample
@@ -45,7 +45,6 @@ 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 3d07950d..07731e6b 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.rpi.sample
@@ -44,7 +44,6 @@ 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 44cd1e31..6ceb29dd 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.sample
@@ -43,7 +43,6 @@ 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 b713f05c..4518b05b 100644
--- a/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
+++ b/meta-boot2qt-distro/conf/bblayers.conf.toradex.sample
@@ -47,7 +47,6 @@ 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/scripts/manifest.xml b/scripts/manifest.xml
index 37bccf2b..e5248d83 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -22,11 +22,6 @@
revision="33c00e34fc2b085ea538445bbd1ba339024d4d8a"
upstream="honister"
path="sources/meta-openembedded"/>
- <project name="meta-python2"
- remote="oe"
- revision="f522fa70f93a9339f3b9991082af69a09fde675a"
- upsream="honister"
- path="sources/meta-python2"/>
<!-- Qt -->
<remote name="qt"
@@ -36,7 +31,7 @@
fetch="ssh://codereview.qt-project.org/yocto"/>
<project name="meta-qt6"
remote="qt"
- revision="3166786ac3ebb2fb1ab743344121563900c44a4e"
+ revision="850937df489adbc499c474927ade192be2fc98b1"
upstream="dev"
path="sources/meta-qt6"/>