Commit Graph

39 Commits

Author SHA1 Message Date
Samuli Piippo
6ed2aff39a conf: remove qtcreator image feature
This is left over from meta-qt5 and has never been supported in meta-qt6.

Pick-to: 6.10 6.9 6.8
Task-number: QTBUG-138741
Change-Id: I05aa1ef540ccd0665b386fd1a72238fefa0fd5e0
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2025-08-18 11:10:29 +00:00
Samuli Piippo
fa57f17b39 Bump version to 6.11.0
Change-Id: I5f1228e4aacd98421be891ed20582e0adbaaae3b
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2025-06-27 10:31:14 +00:00
Samuli Piippo
0b2beb3333 layers: remove unneeded license mapping
This was needed only in kirkstone.

Change-Id: Ic6dd40c1253ed1f6a1be5d4ca6ae9926f3b83414
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2025-06-12 12:10:59 +00:00
Samuli Piippo
89baa7eaa8 layers: update compatible Yocto releases
Add whinlatter to compatible layes and remove old Yocto release
that don't have recent enough CMake to work with Qt. Oldest
supported release for Qt 6.11 will now be Yocto 5.0 Scarthgap.

Change-Id: Ie40fdebd1c80ce913b0e5acbc5d1d1f815366f1e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2025-06-12 12:10:52 +00:00
Mikko Gronoff
87ef009a93 Bump version to 6.10.0
Change-Id: Ie3136b7c629c86a5f8894de061d4a05fc55819d8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2025-01-10 17:59:43 +00:00
Samuli Piippo
a73f4a0f48 layer: add walnascar to layer series
For the next Yocto 5.2 release.

Pick-to: 6.8
Change-Id: I813c4ad4271a3d59c73a5ea53aa99efac6a39eca
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-11-05 13:54:46 +00:00
Mikko Gronoff
611d24b0d7 Bump version to 6.9.0
Change-Id: Ibe3116959d0cd1352d87696bfdd8ea8fd60a8864
Reviewed-by: Jari Helaakoski <jari.helaakoski@qt.io>
2024-06-13 16:04:15 +03:00
Samuli Piippo
d43b178430 layer: add compatibility to styhead
Pick-to: 6.7
Change-Id: I324ba4a26c1559e6cb3d23fb58914fec29f54ca3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-05-30 11:45:31 +00:00
Samuli Piippo
3c24d5dfd2 layer.conf: update LAYERSERIES_COMPAT for scarthgap
oe-core as switched to scarthgap

Pick-to: 6.7 6.6 6.5
Change-Id: Ica326b8be4a23a5b6a52667a98740720185a6f73
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2024-02-12 09:11:01 +00:00
Mikko Gronoff
3bed409064 Bump version to 6.8.0
Change-Id: I40a79a3f1749a2a8647aa963d881b6dacf307d26
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-12-17 15:38:59 +02:00
Samuli Piippo
a6c21eed21 srcrev_update: support for all recipes
Add variable to find base dir for meta-qt6 and use that in
srcrev-update to support using it in any recipe.

Pick-to: 6.7 6.6
Change-Id: I91960508a8ec96ee6fe7af69046915f048925f62
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-12-13 14:55:39 +00:00
Martin Jansa
2713f52a6f layer.conf: fix LAYERDEPENDS_qt6-layer
* qtgrpc depends on protobuf from meta-oe:

  ERROR: Nothing PROVIDES 'protobuf-native' (but /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtgrpc_git.bb DEPENDS on or otherwise requires it). Close matches:
    popt-native
    xcb-proto-native
    xorgproto-native
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'qtgrpc', 'protobuf-native']

* and qtpdf, qtwebengine depend python3-html5lib-native on from meta-python:

  ERROR: Nothing PROVIDES 'python3-html5lib-native' (but /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtpdf_git.bb, /OE/build/oe-core/meta-qt6/recipes-qt/qt6/qtwebengine_git.bb DEPENDS on or otherwise requires it). Close matches:
    python3-toml-native
    python3-tomli-native
    python3-urllib3-native
  ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
  Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'qtpdf', 'python3-html5lib-native']

Pick-to: 6.6 6.5
Change-Id: I616e03e3a259e532e4ccd6ec87a2975c063837fc
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2023-10-18 12:39:51 +00:00
Samuli Piippo
6c221de4fb layer.conf: update LAYERSERIES_COMPAT for nanbield
oe-core as switched to nanbield.

Pick-to: 6.6 6.5
Change-Id: Iebc445cea81d1449f0564f036787c44ba6aa8a87
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-09-11 17:34:56 +00:00
Samuli Piippo
13b98403f5 spirv-tools: remove bbappend
Dunfell is no longer supported, remove unneeded bbappend.

Change-Id: I1249fd9cd6e2344216f225c2aa9e68b65834a9e6
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-08-22 13:03:36 +00:00
Samuli Piippo
b06c0b1d69 Drop support for older Yocto releases
Kirkstone will be the oldests Yocto release supported by Qt 6.7.
Qt 6.7 will be released in spring 2024, at which point Dunfell
will be EOL.

Change-Id: I8fee78d4d75401a502762e4b28987a07bfdd1af4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
2023-08-22 13:03:16 +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
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
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
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
Samuli Piippo
8454efd1ed protobuf: remove upstreamed fix
The protobuf fix is now available in meta-openembedded.

Pick-to: 6.5
Change-Id: I83e911b64cf35767af22b76c19ea27ce818e300a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-31 16:38:52 +00:00
Samuli Piippo
a6f9d2499b Use global variable for Qt version
Add a global variable that can be used whenever meta-qt6 layer is
included in the build to identify the Qt version.

Pick-to: 6.5 6.4 6.2
Change-Id: I3d40d151e0be9f9123d2bf7cbe34a44861e7b093
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-30 06:24:38 +00:00
Samuli Piippo
8c17fb058a qtgrpc: include host tools in the toolchain
Add fix for protobuf so that we can build and include nativesdk-qtgrpc
in the toolchain. The protobuf fix has been merged in meta-openembedded
master, but not in langdale.

Pick-to: 6.5
Change-Id: I37a90e1a79d64a8154ab6fb510a9d8d5cf6d26c5
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2023-01-27 10:39:06 +00:00
Samuli Piippo
ad7dc64e16 layer: add mickledore to LAYERSERIES_COMPAT
Pick-to: 6.5 6.4
Change-Id: I28ebe75e2ae9d824b7bbf671539dafeadb9089d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2023-01-04 08:22:41 +00:00
Samuli Piippo
e950cff143 Add license mapping for GFDL-1.3-no-invariants-only
Add license mapping for GFDL-1.3-no-invariants-only to use the GFDL-1.3
license file in older Yocto releases. This recudes warnings for missing
generic licenses.

Pick-to: 6.4
Change-Id: I51d439515166214fb89f3af60680a77879709ec9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
2022-10-21 10:04:44 +00:00
Samuli Piippo
49ee2bdf07 Use common variables for both LTS and commercial modules
Define QT_COMMERCIAL_GIT variable in layer.conf and use it in both
LTS and commercial modules.

Pick-to: 6.2
Change-Id: If9137331236faa8fb78c02f76629cdf17114d230
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2022-06-14 11:50:25 +00:00
Samuli Piippo
7b0817669a 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.

Pick-to: 6.3 6.2
Change-Id: I673a06685b44a5f0f5518ae51bc45956432739a4
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-05-20 13:21:38 +03:00
Samuli Piippo
2005837511 layer: add langdale to LAYERSERIES_COMPAT
Change-Id: Ibb6af476e2bafc5b65767b800af8d2fa3bed193d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-05-03 10:30:00 +03:00
Samuli Piippo
f80f96848d licenses: add SPDX license mapping to old license names
The common license files have been renamed to use SPDX names, but we
still support some older yocto branches that use the old names.
Add mapping to allow building with older yocto version after the
recipes are updated to the new license names. This avoid warnings:
No generic license file exists for: GPL-3.0-only in any provider

Pick-to: 6.3 6.2
Change-Id: Ib93baf9027442e69ab5bce294449bd203d9be2aa
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-06 11:12:17 +00:00
Samuli Piippo
d36033ca56 layer: use the same priority as the core layer
Some of the python3 recipes we carry are already in meta-python
layer, but not in all the branches that we support. In order to use
the most recent recipe, we need to have same or lower BBFILE_PRIORITY
than meta-python. Depending on the branch, meta-python's priority is
either same or higher than the core layer's priority.

Pick-to: 6.3 6.2 6.2.4
Change-Id: I98c74858c5be69e45a76a45ed10aa1168c614618
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-03-03 10:53:34 +00:00
Samuli Piippo
3ff5acc752 layers: Bump to use kirkstone
Pick-to: 6.3 6.2
Fixes: QTBUG-101142
Change-Id: I85c5dbbfc10184108514dd01a3255018c0dc3db4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2022-02-24 09:36:49 +00:00
Martin Jansa
c9dcbe825e layer.conf: LAYERSERIES_COMPAT: Return dunfell, gatesgarth and hardknott
all currently supported versions (dunfell, hardknott, honister)
do support new syntax (when latest bitbake revision from
corresponding branch is being used).

if it's still not clear, then bitbake is accepting ':' in
** dunfell with 1.46:
   https://git.openembedded.org/bitbake/commit/?h=1.46&id=a6d5fb7554e3cf071e453db56a1e7469ac44277c
   https://git.openembedded.org/bitbake/commit/?h=1.46&id=c5418eae56cc50dbae7951c055434a0c456c53a4
** gatesgarth with 1.48:
   https://git.openembedded.org/bitbake/commit/?h=1.48&id=aa9f7b80cfdb1119050af469a07ebd949829026c
   https://git.openembedded.org/bitbake/commit/?h=1.48&id=14ae61205111383d5f609519c02476925184f6d1
** hardknott with 1.50:
   https://git.openembedded.org/bitbake/commit/?h=1.50&id=f8d1bc200460fc1cb5cbf7a7d1986fd86424b22d
   https://git.openembedded.org/bitbake/commit/?h=1.50&id=9b2d96b27f550da0fa68ba9ea96be98eb3a832a6
** honister with 1.51+:
   https://git.openembedded.org/bitbake/commit/?id=0dbbb4547cb2570d2ce607e9a53459df3c0ac284
   https://git.openembedded.org/bitbake/commit/?id=019251649a38754d5877759d13b664e28dea77de
   and required since:
   https://git.openembedded.org/bitbake/commit/?id=7dcf317cc141dc980634f8c18bfa84f83e57206a

Similarly for poky users (which get bitbake updates together with oe-core updates in combo-layer managed poky repo):
** dunfell:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=dunfell&id=1f7b04355c032cd0de4cbe9352745920964c8057
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=dunfell&id=9c2186108e2e8fcf5837c0ffe9dbdeeaea4b7398
** gatesgarth:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=gatesgarth&id=f2d2136dbb3730abb87699ce03dd54c27ebb7833
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=gatesgarth&id=779ca22928bce94849e32c1bdd5f5d0f64658c2d
** hardknott:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=hardknott&id=666d3421389cc3c01c56e92199cc32bddf1922de
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=hardknott&id=14c5392fded42f17962e1cc07fcc0446881b4fa0
** honister:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=75fad23fc06c008a03414a1fc288a8614c6af9ca
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=d41af446febd516f14f26db53e6572d9eae35b1e
   and required since:
   https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=2abf8a699edd513405befbd1a0eafc8f55d6b514

If your builds don't accept new syntax, then you just need to update bitbake a bit.

Change-Id: I0adbb1ba75086bc61101b1aa5bb99660c5250bbb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-10-01 07:59:33 +02:00
Samuli Piippo
7c25fc3c70 Remove support for previous yocto versions
After the override syntax change, only honister is supported.

Task-number: QTBUG-95705
Change-Id: I2747686f359ef0e39471bb2c20e7980ea2d30647
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-08-24 11:37:26 +00:00
Mikko Gronoff
162d983753 Add hardknott to LAYERSERIES_COMPAT
Pick-to: 6.1 6.0
Change-Id: I07f17e1e63df6e71cf1d4e68f353198093ae6826
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-03-22 08:17:58 +00:00
Samuli Piippo
9e6becf2a4 Add gatesgarth into LAYERSERIES_COMPAT
Change-Id: I38a3188bd87a1857a98ce08dcf788bff3ae16342
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-11 18:04:19 +02:00
Samuli Piippo
f17ee34d01 qt6: add support for selecting Qt license type
Selection can be made between opensource and commercial licensing.
Currently the licensing choise does not affect the build in any way.

Task-number: QTBUG-87188
Change-Id: I008a31b2ad6c50b4f94d80de3fbd0a69fc1065e1
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2020-11-06 09:43:07 +02:00
Samuli Piippo
e6d7750002 layer: remove unsupported layers
Starting with zeus cmake is recent enough.
2020-06-09 15:02:00 +03:00
Samuli Piippo
562aa2e970 Add dunfell to layer compatibility 2020-04-03 16:09:44 +03:00
Samuli Piippo
ba72ceba4f Use same variables for SRC_URI as in meta-qt5 2020-03-20 08:40:09 +02:00
Samuli Piippo
7d63e448b7 initial commit 2020-01-24 11:54:52 +02:00