Commit Graph

59 Commits

Author SHA1 Message Date
Mikko Gronoff
234d810b61 Merge tag 'v6.2.9-lts' into lts-6.2
meta-qt6 v6.2.9-lts release

Change-Id: Ia90d23f7947f2f4f7a8d516c33ffe171418fce98
2024-05-10 14:55:39 +03:00
Mikko Gronoff
b774cbf5c3 Merge tag 'v6.2.8-lts' into '6.2'
meta-qt6 v6.2.8-lts release

Change-Id: I7d63c0d3c306f08d2bd529a197234a82104f7c70
2024-01-11 15:00:59 +02:00
Mikko Gronoff
4e50e99e25 Merge tag 'v6.2.7-lts' into '6.2'
meta-qt6 v6.2.7-lts release

Change-Id: Ic22bf718ec53cd9d8d472e61c14ff430af91885e
2023-09-29 11:23:07 +03:00
Samuli Piippo
4955c78e5e Coin: use correct path for mirror
Change-Id: I878122ac5a34aaf464bb4190e3307793c53eabba
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 651610f42f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-05-29 08:49:10 +00:00
Samuli Piippo
760d334c61 Coin: fetch repo from github
Git clones from google fail frequently with:
   >> fatal: early EOF
   >> error: index-pack died
Switch to using github mirror for the git-repo repository.

Change-Id: Id0cbf3c59e50869d62880e56251b003490c4c1ee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 61f984c49d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-03-09 21:26:56 +00:00
Samuli Piippo
bf5885bc17 coin: always use the latest platforms for CI build
Change the CI dependencies so that we always get the VM configurations
from the qt5.git dev branch. This makes sure that all Yocto builds,
regardless of the Qt version, are using the same host VM version.

Change-Id: Iceb5ca006b8d83ed636d59566a115d64d3919e38
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a162d8c5a6)
2023-02-15 08:30:33 +00:00
Samuli Piippo
dbbb59a2f5 Coin: add branch and repo overrides for lts modules
Until the opensource lts releases are pushed to code.qt.io,
we need to override the git configurations to fetch the modules
from the tqtc repos. This add the same configs as qt6-lts.inc did
when the release was commercial-only, but only for the CI builds.

Change-Id: I789b3600c3aa0a33beeff3cf895944fae51de86c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-02-15 08:30:25 +00:00
Samuli Piippo
c3fab4da87 coin: always use the latest platforms for CI build
Change the CI dependencies so that we always get the VM configurations
from the qt5.git dev branch. This makes sure that all Yocto builds,
regardless of the Qt version, are using the same host VM version.

Change-Id: Iceb5ca006b8d83ed636d59566a115d64d3919e38
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a162d8c5a6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-02-14 15:32:57 +00:00
Samuli Piippo
a3191d0fd7 Add recipe for QtInsightTracker
QtInsightTracker is a commercial-only module.

Task-number: ANALYTICS-238
Change-Id: I30412dec8552898b76865402c2e2ccfcae8d1904
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit 56710e8724)
2023-02-08 13:28:43 +00:00
Samuli Piippo
1f5da8b806 Coin: don't use zip format for mingw sdk
Zip doesn't handle symlinks correctly and sdk won't work.

Change-Id: Id57cef766f708d714919994ea947701fcc83089a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 918cb5b310)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-12-14 16:53:37 +00:00
Mikko Gronoff
a5a773400b coin: remove unused test-gatesgarth.inc
Unused for a long time.

Change-Id: If1689ce4c96409598cd5501d7e232481c1cc9be1
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-23 13:48:27 +02:00
Samuli Piippo
42326e359f qtwebengine: move to 102-based chromium
Latest chromium no longer supports x86 builds.
Enabled spellchecker as build fails without it.

Change-Id: I6f40d48c20a47edbbc958e2f9c25907d05feb5b1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit c1441fcabc)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-16 13:41:09 +02:00
Samuli Piippo
0f2b57455d Coin: enable examples for qtapplicationmanager
Change-Id: If4065a9b309fafd8e05d018495dedd22be956aa7
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 85d9d71e27)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-14 22:49:48 +02:00
Mikko Gronoff
9c69307144 coin: update test-no-webengine.inc
Update bitbake syntax.

Change-Id: Ifc0fa4ad1e3926cc55b38d8a008e914962fdd779
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2022-11-14 13:25:52 +02:00
Samuli Piippo
72cf04bedb qtwebengine: update to 94-based chromium
QtWebEngine based on 94 chromium can be build with python3.
Remove all references to python2 and its meta layer.

Latest oe-core has version of ICU, freetype, harfbuzz and ffmpeg
that are not compatible with Chromium. Disable those PACKAGECONFIGs
by default.

Cherry-picked without qtpdf which is not supported on lts-6.2.

Change-Id: Ie2e38db14df0f51aaa87ecde7e0487b31be0bddd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 57b22c6ea0)
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-13 10:31:37 +00:00
Samuli Piippo
f9b57ed9d7 Update handling of commercial modules
Add new packagegroup for all commercial-only Qt addon modules and add
new variable QT_COMMERCIAL_MODULES which can be used to control if the
modules are included in the build. The same variable also turns on the
use of Qt QML Compiler. Use common include file for the commercial modules.

Change-Id: I673a06685b44a5f0f5518ae51bc45956432739a4
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7b0817669a)
2022-05-24 09:49:59 +03:00
Samuli Piippo
56a32f7d8a Coin: build examples for all modules
Add example build for the missing modules.
Skip qtapplicationmanager due to QTBUG-101508.

Change-Id: Ib01935ac4314f3b97583f032e09fda2966f17549
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 6a5ae1effb)
2022-05-09 10:19:16 +03:00
Samuli Piippo
2aee7a8de8 coin: use correct domain for yocto-cache
Change-Id: I830bf9bcaabf954c4f25b380731781e557a134b6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a0e53e01e0)
2022-05-04 10:41:25 +03:00
Samuli Piippo
381e2420c5 coin: rename the shared sstate-cache
Use DISTRO variable in the sstate-cache directory. This lets use
reused the ci configuration in other distro builds as well.

Change-Id: I51ef6cca7fd938046e5b6510087fc4d62f2a4eb3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit e6fba93482)
2022-05-04 10:41:20 +03:00
Samuli Piippo
718ac4d9cd qtspeech: remove recipe
QtSpeech is not officially supported on Qt6 and no support is provided
in the LTS phase. Remove the recipe.

Change-Id: Ief4ab2d21ab1326d3ab79b120b5da311dc2cab66
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-05-03 20:48:58 +03:00
Samuli Piippo
839ba6a1c8 Coin: add CI build for kirkstone
Add CI build using Yocto kirkstone branches and retire hardknott build
in favor of it. Hardknott is EOL on April 2022. Only dev branch will
continue to be tested against Yocto master.

Change-Id: I9aad0e14c1a5054b2e9eab85ec8a2f2d603f6427
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 670a077467)
2022-04-28 10:39:23 +03:00
Samuli Piippo
c47fff0a88 coin: use shared Hash Equivalence server
Use shared Hash Equivalence server together with sstate cache.
The Hash Equivalence server can further improve sstate re-use.

Change-Id: I037b565344942cf99c4992e4ff9769fd47d9c77d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9ee589de19)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-08 05:09:21 +00:00
Samuli Piippo
94d47588e0 Coin: adapt to variable renaming
In kirkstone, some of the variable have been renamed to
use inclusive language.

Change-Id: Ic03fc3a748ea6a4e3e510040b9cd6b5e038d4662
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 2d4825f309)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-24 15:46:33 +00:00
Samuli Piippo
20b5fb31c7 Coin: use include files for configuration
Restructure the Coin build configs so that all configurations
are already in .inc files that can be easily included.

Change-Id: I93d74254804b7d17106a3f08af2973464e669928
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 0708a33ea6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-24 15:46:26 +00:00
Samuli Piippo
d50f63cea7 Coin: build webengine without system ffmpeg
oe-core/master has incompatible ffmpeg version, instead use the
chromium's own version.

Change-Id: Ic14b85d6f07fd538c18bbb97647fb9bc9c923cb9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-09 09:08:34 +02:00
Samuli Piippo
f369aa3f3b Coin: use manifest to fetch meta layers
Use manifests to fetch meta layer repositories. This enables
us to easily pin the upstream layers to specific revision if
and when the latest revision gets broken.

Build again against master branch, the manifest is pinned to
working meta-openembedded revision.

Change-Id: I5d217f6932aaf5eaacae8ccbc790ea31aaa27f37
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 688791f03d)
2022-02-09 09:08:21 +02:00
Samuli Piippo
5bfd174e39 Coin: disable CI build against upstream master
meta-openebedded is currently broken due to nativesdk-python3-cryptography.

Change-Id: I99fa9313c1c8d1196bc09a8755269ecffe75ce56
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3da9ed068a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-20 10:18:54 +00:00
Samuli Piippo
1f5be3a46a Revert "Coin: add required zstd"
This reverts commit a77f474aba.
Zstd is now available in the provisioning.

Change-Id: Id66a3a8797e0c893318974a6fe2dd4e032d563b4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 7c192d68dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 19:41:45 +00:00
Samuli Piippo
d2ca64d95a Use correct domain for yocto-cache
Change-Id: I669912271b14cc35c09e390fe26b2da4a6cdb8b3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 16be6131ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-24 13:44:43 +00:00
Samuli Piippo
1bca74b41a Add QML Script Compiler
The QML Script Compiler is a commercial drop-in replacement
for the cachegen tool to compile your QML script expressions
and functions to C++ ahead of time.

It is available only for commercial customers and source code
fetch needs proper ssh keys available for accessing the repository
at codereview.qt-project.org.

Usage of QML Script Compiler is not enabled by default, but if
enabled globally using ENABLE_QMLCOMPILER variable, all Qt modules
that have dependency to qtdeclarative are compiled using Qt QML Compiler.
Its usage can also be enabled or disabled by each individual recipe.

Task-number: QTBUG-95475
Change-Id: Iee8539ee8ddc17c70e9ed81ab3b4f242f9386586
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit d0e7002304)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-11-12 16:08:17 +02:00
Samuli Piippo
181cbf3683 Coin: add builds against Honister
Honister is now released, add it to the CI test builds.
Drop Gatesgarth since it's now EOL.

Change-Id: Ice5813836d8a4edb435db71017d231468993edcf
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 178142ee57)
2021-11-04 10:43:11 +02:00
Samuli Piippo
3e1eb12a5c coin: use openembedded from the upstream source
Github won't be supporting git protocol anymore, switch to using
layer from openembedded.org.

Change-Id: Id711fe7818d37650b0643c17bd3386ca1a344f9a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 3cc53e8e7f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-03 22:43:53 +00:00
Samuli Piippo
bf9fdb2b79 Coin: build Qt packagegroups in CI integrations
Current CI build using the toolchain recipe is a bit limited as the
package_qa tasks were never ran for the Qt recipes. Also the rm_work
was not done which lead to disk space running out in CI builds. Add
both native and target packagegroup recipes to the target builds that
will ensure that both of the above mentioned tasks are now run.

Change-Id: Ifb73b807f4f9f551836bfa20003aaf88bc758d78
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit 673457878e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-29 17:16:55 +00:00
Samuli Piippo
5d15c6cce8 Coin: extend CI coverage to yocto master branch
Add master to the CI build. Sync coin/test-configs.inc from dev regarding
qtwebengine configuration, which now needs to be disabled from gatesgarth
and dunfell.

The target machines are aligned with dev so that same targets are build
with same yocto branch. This should allow reuse of existing builds
for both branches.

Task-number: QTBUG-97065
Change-Id: I81d5ef3c554f2ebbd065283031a9c99eea6dced3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-10-08 14:11:15 +03:00
Samuli Piippo
f8f0d83eb3 Coin: add required zstd
Bitbake now requires zstd, which is not yet available in the provisioning
of the CI machines.

Change-Id: I9f75219a686580ae228384c4fb4a6222a0e6fd09
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit a77f474aba)
2021-10-08 14:11:06 +03:00
Samuli Piippo
b44436cad8 Revert "Coin: disable qtbase examples in dunfell"
The CMake issue has been fixed, enable qtbase tests again.
This reverts commit 32685d7671.

Change-Id: Id820482b2bb313a0e79a5305e2e8d58564d519a6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-10-07 16:05:29 +03:00
Samuli Piippo
1f22d3f13c Add recipe for QtWebView
Task-number: QTBUG-97001
Change-Id: Id8f7dbfc242baaec11c07f7137e72b429f64cfee
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8b7aa7dd6f)
2021-10-07 09:27:11 +03:00
Martin Jansa
6d74a73ef3 Convert to new override syntax
This is the result of automated script (0.9.3) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Change-Id: I23f9e955618b36878635b17265f0d8bb81a5cf55
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-05 14:33:32 +02:00
Samuli Piippo
93bc55f4f4 Coin: increase CPU count for CI builds
For Coin builds, ask for 16 core build machine, but limit the maximum
number of bitbake tasks to 8. Try to speed up the builds, but to avoid
OOM which can occur when several Qt modules start to build in parallel
after dependency to qtdeclarative is satisfied.

Change-Id: I3a0d646f4204fb0269bba2356543589a5620ed3e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 170ca88bcd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-16 15:54:44 +00:00
Samuli Piippo
7f83b93082 Coin: give CI build more time to complete
Raise max build to 12 hours, but lower time without output to 2 hours.

Change-Id: I866bf07324793fce4ce88189053216abd8b4302f
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit bc1d2a0fff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-09 20:37:26 +00:00
Samuli Piippo
403ab76764 Add QtWebEngine
Build QtWebEngine using CMake. Include helper files (chromium-gn.inc and
gn-utils.inc) from meta-browser. QtWebEngine build no longer requires
additional support in the host system, instead the build time tools
are run using QEMU.

WebEngine requires python2, available from meta-python2 layer, and
at least CMake 3.19. Only oe-core/hardknott provides recent enough CMake.
CI builds of webengine are limited to hardknott for this reason.

To use system ICU, QtWebEngine requires ICU 68 or up. This is also
available starting from oe-core/hardnott.

spellchecker feature doesn't work properly, since it requires
a native util to be built.

Task-number: QTBUG-93825
Change-Id: Id150275f5adfedd8f1acdc5f92c46a437da84f2e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2021-09-09 18:47:43 +03:00
Samuli Piippo
32685d7671 Coin: disable qtbase examples in dunfell
As a workround for apparent CMake issue, disable examples from
qtbase.

Task-number: QTBUG-96197
Change-Id: I95cb44f21c22d1e4a1c73913fde5f2a49fcd5530
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-05 21:34:33 +03:00
Samuli Piippo
70dff380b2 Coin: allow yocto version specific configurations
Add easy way to have different configuration for the CI builds
based on the current Yocto version.

Pick-to: dev
Change-Id: Idfda5d2e9079864e210382fa0e928b969fae311d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-05 21:34:22 +03:00
Samuli Piippo
d4232d5a71 Coin: use toolchain for the CI test
Build the toolchain recipe for CI test, which allows us the limit
what recipes are included.

Change-Id: I9c532dcc97979bf40a0ca094850d7a0602f2f9d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-30 08:18:53 +03:00
Samuli Piippo
bb3c5a08a2 Coin: remove uninative overrides
Upstream has more recent versions already.

Change-Id: Idc64576ddbdb2549e2b4af802cc8b8b5b62f704e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit fdda14cfbc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-24 13:36:24 +00:00
Mikko Gronoff
3b3572a59c qt6: update submodules
* Update to latest content in Qt 6.2 branch
* qtquickcontrols2: remove recipe & references
  (quickcontrols2 was merged into qtdeclarative
  module, see QTBUG-95173)
* Proposed 6.2.0 beta3 content - one qtdeclarative patch
  added on top of that to be able to build native side
  successfully (accessibility disabled)

Task-number: QTBUG-91012
Change-Id: Ie72f98518ceae98b83ceddb4b97a3772c40a9185
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-08-17 08:29:54 +03:00
Samuli Piippo
36c7a0bd38 Coin: stop using master branch for CI build
Latest bitbake has changed the override syntax to use colons
instead of underscores. This makes master branch incompatible
with meta-qt6 until we convert to the same syntax.

Change-Id: I5181882f44d49ce872f76e1620c5e3c195f6686c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2021-08-04 16:00:41 +03:00
Samuli Piippo
29999c4ffb qtgraphicaleffect: remove recipe
QtGraphicalEffects has been moved to be part of qt5compat
module for compatibility with Qt 5 code. This can be accessed
by importing "Qt5Compat.GraphicalEffects

Pick-to: 6.1
Change-Id: Ia3478e300938a9c612472bf98256d0f521489c33
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-06-11 06:40:34 +03:00
Samuli Piippo
89475754d3 Add recipe for Qt Multimedia
Qt Multimedia is still in WIP status.

Task-number: QTBUG-91411
Change-Id: I8e06e44ef58e260fb8cf6dd25f694cb405018d2a
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-04-08 13:05:32 +03:00
Samuli Piippo
c9da0eaec3 Update CI build
Hardknott Yocto version is now available, add it to the CI builds.
Only dev branch remains tested against Yocto master.

Change-Id: Iec1227d616ff95b8406217f4d18ebfba80a0300a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-04-07 13:34:18 +02:00