Commit Graph

621 Commits

Author SHA1 Message Date
Samuli Piippo
12f78361ed coin: add workaround for QA warning on qemu
QEMU has QA warning on runtime dependencies which breaks
our CI build since they are treated as errors.

Pick-to: 6.6 6.5
Change-Id: I1f2699d62d556b538da85aa12d8c2ec91483fb0b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-16 22:16:33 +03:00
Samuli Piippo
90226dfc47 coin: use INIT_MANAGER to select systemd
Yocto has INIT_MANAGER variable that can be used to select
the init manager. Use it instead of doing all to separate
changes ourselves.

Pick-to: 6.6 6.5
Change-Id: I8aa31de9116048628a55d630ed3296fac28dfec8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-16 19:16:27 +00:00
Samuli Piippo
69a8018ec1 qtshadertools: add runtime dependency to spirv-tools
Add runtime dependency to spirv-tools as the qsb utility can use
spirv-opt at runtime. Cannot include it for mingw32 toolchain
as compilation fails.

To support dunfell, add BBCLASSEXTEND append to the spirv-tools.

Fixes: QTBUG-113210
Pick-to: 6.6 6.5 6.2
Change-Id: Icce264b1f2bff5f56cf2b40a0420c5001493e236
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-15 12:00:58 +00:00
Samuli Piippo
c0318a6ad8 examples: add runtime dependency to main package
If examples are only using QML modules, the package manager won't
add automatic dependency to either the main or -qmlplugins packages,
and those might not get installed to the image. Add the runtime
dependency explicitly for the examples package.

Fixes: QTBUG-115310
Pick-to: 6.6 6.5 6.2
Change-Id: I5b713d3a65f794da1ab0113cf1d7f69035e29288
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-15 12:00:40 +00:00
Samuli Piippo
21beafaf82 readme: add note about release branches and tags
Pick-to: 6.6 6.5 6.2
Fixes: QTBUG-114723
Change-Id: I2f6b4ce365b53ec7bd96555c0d6fcbea0e7e50cd
Reviewed-by: <inkamari.harjula@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-15 15:00:31 +03:00
Khem Raj
431d1405f8 qtwebview: Match COMPATIBLE_MACHINE with qtwebengine
qtwebview has direct build dependency on qtwebengine and it can be tried
to build in world builds since it does not have same restrictions on
supported hosts as qtwenengine, therefore match it.

Change-Id: I018471bacc232349a5763822daf3131ae32f17c0
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-08-15 05:00:23 -07:00
Khem Raj
d4785f6c6f conan.inc: Remove support
meta-qt6 plans to use conan have not materialized

Change-Id: I038dcf17729e4706f5319ddd3e0f33d4a5facc2d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-08-15 05:00:12 -07:00
Khem Raj
3484b503b5 qtbase: Add a packageconfig knob to enable lld linker
Change-Id: I402859e22fae0151424c2187401fa9576b616d19
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-08-15 05:00:05 -07:00
Martin Jansa
d65dc4592b *.patch: add Upstream-Status to all patches
There is new patch-status QA check in oe-core:
https://git.openembedded.org/openembedded-core/commit/?id=76a685bfcf927593eac67157762a53259089ea8a

Change-Id: I2da4efd9736cccb73f8f5fa40ff4fd4c973183c5
Pick-to: 6.6 6.5
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-08-14 12:11:28 +02:00
Samuli Piippo
8f29099348 Add 6.6 compatibility notes
Update readme for the 6.6 branch compatibility and testing.

Pick-to: 6.6
Change-Id: Ib093cd11c3fe4c57c511f59fd0cf82f90969c15c
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-06-19 07:40:48 +00:00
Paul Geurts
c677a9e91e Remove legacy license identifier mappings in layer config
The layer configuration uses SPDXLICENSEMAP to change GPL-3.0-only to
GPL-3.0 (and other maps). Inluding meta-qt6 results in _all_
GPL-3.0-only licensed packages to be changed to GPL-3.0. As a result,
setting

INCOMPATIBLE_LICENSE += "GPL-3.0* LGPL-3.0* AGPL-3.0*"

does not filter out GPL-3.0-only packages anymore. This means
GPL-3.0-only packages still land in the target image. Adding GPL-3.0 to
the INCOMPATIBLE_LICENSE settings is not allowed, as Yocto has
deprecated these licenses.

This removes these license mappings so the incompatible license filter
is restored.

Change-Id: I5d1c13764bd034f5a20ea0cf3b6d98f1d29244d7
Pick-to: 6.6 6.5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-06-15 15:48:36 +02:00
Samuli Piippo
4af8539dcf qtwebengine: update patch
Fuzz detected.

Pick-to: 6.6
Change-Id: I5be6c8841f414a3fe73d0805be6b2b83e667c155
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-06-09 05:53:53 +00:00
Samuli Piippo
361bb6e1ef qt6: bump version to 6.7.0
Change-Id: I8e04c70ccc31d41b7b63a83d2845b2acf33fc99c
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-06-09 05:53:44 +00:00
Qt Submodule Update Bot
fdbfe37d38 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I9cfcdf63c9908be61782638d5b7bd80c5c61582c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-06-09 05:53:29 +00:00
Samuli Piippo
4729a37e36 qttools: add PACKAGECONFIG for clang dependency
QDoc depends on libclang and using clang toolchain causes build error:
| CMake Error at qttools/6.6.0-r0/recipe-sysroot/usr/lib/cmake/Qt6/QtToolHelpers.cmake:623 (message):
|   Failed to find the host tool "Qt6::qdoc".  It is part of the Qt6ToolsTools
|   package, but the package did not contain the tool.  Make sure that the host
|   module Tools was built with all features enabled (no explicitly disabled
|   tools).
because libclang was found for qttools-native, but not for the target.

Add PACKAGECONFIG that can be enabled when using clang toolchain
if there is need for the qdoc, but otherwise keep it disabled.

Pick-to: 6.6 6.5 6.2
Change-Id: Idc4e35936511ef0c208d7e8fd6f8fc51f3f8a1e2
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Khem Raj <raj.khem@gmail.com>
2023-06-08 13:20:07 +00:00
Qt Submodule Update Bot
8b9d5c95ca Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1745e6fe5ba8ff72116f43acebd740838deb8735
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-31 07:50:46 +00:00
Samuli Piippo
8f67afff3f qtbase: add PACKAGECONFIGs for different linkers
Add PACKAGECONFIG options for gold and bfd linkers so that they can
be easily changed independently of the ld-is-gold DISTRO_FEATURE.

For CI builds, drop ld-is-gold feature and instead enable gold only
for Qt modules.

Pick-to: 6.5
Change-Id: I63e3835f15c732f57740b6718245e4f45ddb6c8c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-29 17:07:17 +00:00
Samuli Piippo
6ad68945b5 qtbase: add runtime dependency to C.UTF-8 locale
Qt expects to have UTF-8 locale available. If the current locale
is not UTF-8, Qt will try to use C.UTF-8 locale. Make that available
by adding RRECOMMENDS to locale-base-c package.

Task-number: QTBUG-113371
Pick-to: 6.5 6.2
Change-Id: I48f18488413168afbeffddb9eac58985d1b8a988
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-29 04:38:35 +00:00
Samuli Piippo
651610f42f Coin: use correct path for mirror
Pick-to: 6.5 6.2
Change-Id: I878122ac5a34aaf464bb4190e3307793c53eabba
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-05-29 07:38:25 +03:00
Samuli Piippo
30f672a28d qtwayland: update patch
Fuzz detected.

Change-Id: I422205975b9d6acfa67c238bf27fe334fb678727
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-05-29 04:37:29 +00:00
Qt Submodule Update Bot
3571ef11fa Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: If0be552e9c3c6f7699d78333240435f723604d4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-29 04:37:25 +00:00
Martin Jansa
e1cacf710f qt3d: Backport assimp fix for build with gcc-13
* fixes:
  http://errors.yoctoproject.org/Errors/Details/704200/

  qt3d/6.5.0-r0/git/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp:475:61: error: 'uint32_t' is not a member of 'std'; did you mean 'wint_t'?
    475 |         if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
        |                                                             ^~~~~~~~
        |                                                             wint_t

Pick-to: 6.5
Change-Id: I503f18ae93a24fe08b66827b4ab2dc5b7562819a
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-05-25 07:23:32 +02:00
Olaf Mandel
16c7da9d10 Remove hard dependency on meta-python
Set up the BBFILES_DYNAMIC variable to include meta-python and move all
python recipes to the corresponding dynamic-layers directory. This
prevents failures to parse recipes if meta-python is not available.

Pick-to: 6.5
Fixes: QTBUG-113712
Change-Id: If26668e8d901c89be8527ff3951a00d739a89372
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-05-25 07:23:05 +02:00
Qt Submodule Update Bot
cf976a7d83 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I512089793ac3ada9e7a76a3af89fec49ada978ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-23 08:58:00 +00:00
Samuli Piippo
6777ad5f22 qtvncserver: add PACKAGECONFIG to enable password protection
If LibTomCrypt is available, Qt VNC Server will be built with support
for password protection using DEC Authentication.

Pick-to: 6.5
Change-Id: Id866d1facbbff0a50c39fe2e440e64e3cca8a579
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-05-19 04:27:47 +00:00
Qt Submodule Update Bot
44b5c08a38 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I40c7af9f3b6b8b5fd3d19d5ff5c16db7ea0ec56a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-16 11:44:05 +00:00
Qt Submodule Update Bot
2bb6b8dcc3 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: If5217b9e821089f658ff3d6efcd016cb204e2aa3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-15 13:32:06 +00:00
Qt Submodule Update Bot
c3512694d2 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I2200feae28698a7fcafd46f29158b33a24ea3816
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-12 06:41:14 +00:00
Mikko Gronoff
f6958965bd Revert "qtgrpc: add patch for build issue"
This reverts commit 0300ccc33f.

Reason for revert: available upstream

Change-Id: I1e9f1257cfc50d412d2e4c2f2b018b1ea596e890
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-05-12 06:41:13 +00:00
Mikko Gronoff
0300ccc33f qtgrpc: add patch for build issue
Add (upstream pending) patch to fix build issue in the module:

"error: format not a string literal and no format arguments [-Werror=format-security]
| 194 | QTest::addRow(rus.id().constData())"

Change-Id: I4cedc32cca000fc217e88a8a832c258e60a0cb4f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2023-05-08 16:47:38 +03:00
Mikko Gronoff
c12a762bfe qtwebengine, qtwayland: refresh patches
Refresh patches to fix build after latest submodule update.

Change-Id: I7f4e5d05287af89332b104b5a74f7ea93d049baa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit c97feb4696)
2023-05-08 16:47:15 +03:00
Qt Submodule Update Bot
a7a5c14328 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1253e710eed5785695b09dc8fe49ee10c66e059d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-08 13:47:03 +00:00
Samuli Piippo
5b387fd78d packagegroups: enable workaround for allarch packagegroup
Enable workaround for the sanity check of allarch packagegroups
which caused
ERROR: nativesdk-packagegroup-qt6-toolchain-host-essentials-1.0-r0
  do_package_write_rpm: An allarch packagegroup shouldn't depend on
  packages which are dynamically renamed (nativesdk-qttools-dev
  to nativesdk-libqt6uitools-dev)

Nativesdk changes the PACKAGE_ARCH correctly, but it cannot be
inherited first because that would throw another sanity warning.

Pick-to: 6.5 6.2
Fixes: QTBUG-113178
Change-Id: Ifd77ef76f37b9fe39ef38adcc28c87130bf6d6d4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-04-28 06:47:18 +00:00
Qt Submodule Update Bot
07a1ee7ec1 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I55ac80b7554b0c5d4b6ba5292912020921b7980a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-04-25 23:25:54 +00:00
Samuli Piippo
a938dbc6c5 qtgraphs: include only when opengl is available
QtGraphs has hard dependency to opengl, don't include it in packagegroup
unless DISTRO_FEATURE is enabled.

Change-Id: I86ea98c7dd70d25ba20b348681e3c17e782c9576
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-04-20 18:46:33 +00:00
Samuli Piippo
7931febe45 coin: test against mickledore
Add testing against Yocto 4.2 mickledore.

Pick-to: 6.5
Change-Id: If69b95726e858849470ed433235916811501aed8
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-04-20 13:17:16 +00:00
Samuli Piippo
8f50970006 qtwayland: enable all wayland drivers
Remove separate dmabuf PACKAGECONFIGs and let qtwayland
enable all client buffer integration plugins it can.

Task-number: QTBUG-112725
Pick-to: 6.5
Change-Id: Ic841f3349fee36e5207d9b60e5733ac8ee79ee56
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-04-19 10:20:54 +00:00
Samuli Piippo
4d5ed9e090 Add recipe for Qt Graphs
Qt Graphs for data visualization will be replacement for Qt Datavis 3D.

Fixes: QTBUG-112806
Change-Id: I63e5c746a1e79c14a7e203800d60401497e5bb0d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-04-19 10:20:30 +00:00
Samuli Piippo
44990089fc srcrev_update: use renamed variable
oe-core renamed its internal variable, set both old and new variable
to work with old and new versions of oe-core.

Pick-to: 6.5
Change-Id: I90293c6d37c3ca5d5d82d67e1269afa2b12f1d89
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-04-19 10:20:24 +00:00
Martin Jansa
f26b62e29e packagegroup-qt6-commercial-modules: include qt6-commercial.inc
* all rdepends are skipped without Commercial Qt, make sure the
  packagegroup is skipped as well

* fixes:
  ERROR: Nothing RPROVIDES 'qmlcompilerplus' (but meta-qt6/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb RDEPENDS on or otherwise requires it)
  qmlcompilerplus was skipped: Available only with Commercial Qt
  NOTE: Runtime target 'qmlcompilerplus' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['qmlcompilerplus']
  ERROR: Nothing RPROVIDES 'qtvncserver' (but meta-qt6/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb RDEPENDS on or otherwise requires it)
  qtvncserver was skipped: Available only with Commercial Qt
  NOTE: Runtime target 'qtvncserver' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['qtvncserver']

Pick-to: 6.5 6.4
Change-Id: I373c034989a643b5e95f84deb5130580201eddea
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-04-17 10:29:07 +02:00
Ari Parkkila
88ffeb7c99 Add python3-appdirs to native and nativesdk builds
Fixes: QTBUG-112774
Pick-to: 6.5
Change-Id: Ic8eca3cc0d6de2262581ea2db804f510a0c6f8af
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-04-13 10:57:10 +03:00
Qt Submodule Update Bot
72ff67de1d Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I665f1dafe100ab9bb24a6f54ba74b512dae3244c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-30 04:58:12 +00:00
Qt Submodule Update Bot
7f534313c6 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ib5b1ae1a8090927efe17d7cc16c8dbd43646b910
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-29 02:10:59 +00:00
Samuli Piippo
e54ee19bfa Make python-html5lib optional
Add python-html5lib to the SDK only if openembedded layer is available.

Pick-to: 6.5
Change-Id: I381382c355e2834c2aadd5976e59007be0549ac9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-03-27 10:39:43 +00:00
Samuli Piippo
a4bf9c64e5 qtserialbus: socketcan need openembedded layer
Don't enable socketcan PACKAGECONFIG unless openembedded layer
is available.

Pick-to: 6.5 6.2
Change-Id: I54aa0d70014448bf5425ef7a49f9a32e27ba7807
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-03-27 10:39:39 +00:00
Qt Submodule Update Bot
99256fd797 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: Ief959ca1a20ba4764cdb00e3638340dd68ea0643
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-24 07:18:33 +00:00
Andrej Valek
d4f4b54f4e qt6-git: do not override CVE products
Some components use also base name in NVD CVE database product:
| sqlite> select * from products where product like 'qtbase';
| CVE-2019-18281|qt|qtbase|5.11.0|>=|5.11.3|<=
| CVE-2019-18281|qt|qtbase|5.12.0|>=|5.12.5|<
| sqlite> select * from products where product like 'qtsvg';
| CVE-2021-45930|qt|qtsvg|5.0.0|>=|5.15.2|<=
| CVE-2021-45930|qt|qtsvg|6.0.0|>=|6.2.1|<=

Pick-to: 6.5 6.4 6.2
Change-Id: Ic8cbc59522731f49907e10bf08c6a00a213ae006
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-03-22 14:03:11 +00:00
Samuli Piippo
a55215df48 coin: be explicit about accepted commercial licenses
Dunfell is only branch that still uses the old whitelist variable.
Rename the include file and be specific what commercial recipes the
build needs. Remove the separate post-inclusive include file and move
the accepted commercial license variable to common include file.

Pick-to: 6.5
Change-Id: Ic80b42d71037637298c805a60f20c8737f00b026
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-03-22 14:02:58 +00:00
Qt Submodule Update Bot
2ce7415544 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1da1c9b6b95d5d4d3f20b9b63b9b9c2687179fa0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-22 04:27:11 +00:00
Qt Submodule Update Bot
ab985c2b26 Update submodule refs on 'dev' in yocto/meta-qt6
Change-Id: I1af8a1c4bdf7d5f925ac064e0a9bf351dd620724
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-03-20 13:52:52 +00:00