CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy license identifier mappings in layer config

Browse Source 
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>
This commit is contained in:
Paul Geurts 2023-06-09 10:00:18 +02:00
parent 4af8539dcf
commit c677a9e91e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/layer.conf
View File

@ -53,7 +53,4 @@ QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
QT_COMMERCIAL_MODULES ?= "0"
# License mapping back to old license files
SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0"
SPDXLICENSEMAP[LGPL-3.0-only] = "LGPL-3.0"
SPDXLICENSEMAP[GPL-2.0-or-later] = "GPL-2.0"
SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"