Commit Graph

17 Commits

Author SHA1 Message Date
Samuli Piippo
cd751f5ae2 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.

Change-Id: I3d40d151e0be9f9123d2bf7cbe34a44861e7b093
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit a6f9d2499b)
2023-01-30 12:28:30 +00:00
Samuli Piippo
187f6dcc86 layer: add mickledore to LAYERSERIES_COMPAT
Change-Id: I28ebe75e2ae9d824b7bbf671539dafeadb9089d0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ad7dc64e16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-05 10:02:21 +00:00
Samuli Piippo
c8b68f42a6 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.

Change-Id: I51d439515166214fb89f3af60680a77879709ec9
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
(cherry picked from commit e950cff143)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-10-21 10:51:10 +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