From c677a9e91ed8cc6d16c9e7363754394f61bc6738 Mon Sep 17 00:00:00 2001 From: Paul Geurts Date: Fri, 9 Jun 2023 10:00:18 +0200 Subject: [PATCH] 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 --- conf/layer.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 8051a9b..0fa800a 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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"