mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

default-distrovars/multilib: update license whitelists to use canonical names

Browse Source 
Now that all licenses are canonicalised to SPDX names when processing, we need
to rename the whitelists to the match.

[RP: Fixed up multilib.bbclass too]

(From OE-Core rev: 5b6cdac26e35e9a3b8b09185fc16765fa99dfe5f)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2014-07-16 22:08:14 +01:00
committed by Richard Purdie
parent ba197e6ff3
commit c9a16c563e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/multilib.bbclass
+1 -1
View File
@@ -50,7 +50,7 @@ python multilib_virtclass_handler () {
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
# Expand the WHITELISTs with multilib prefix # Expand the WHITELISTs with multilib prefix
for whitelist in ["HOSTTOOLS_WHITELIST_GPLv3", "WHITELIST_GPLv3", "LGPLv2_WHITELIST_GPLv3"]: for whitelist in ["HOSTTOOLS_WHITELIST_GPL-3.0", "WHITELIST_GPL-3.0", "LGPLv2_WHITELIST_GPL-3.0"]:
pkgs = e.data.getVar(whitelist, True) pkgs = e.data.getVar(whitelist, True)
for pkg in pkgs.split(): for pkg in pkgs.split():
pkgs += " " + variant + "-" + pkg pkgs += " " + variant + "-" + pkg
meta/conf/distro/include/default-distrovars.inc
+3 -3
View File
@@ -23,9 +23,9 @@ IMAGE_FEATURES ?= ""
# This is a list of packages that are used by the build system to build the distribution, they are not # This is a list of packages that are used by the build system to build the distribution, they are not
# directly part of the distribution. # directly part of the distribution.
HOSTTOOLS_WHITELIST_GPLv3 ?= "" HOSTTOOLS_WHITELIST_GPL-3.0 ?= ""
WHITELIST_GPLv3 ?= "less" WHITELIST_GPL-3.0 ?= "less"
LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime" LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime"
COMMERCIAL_AUDIO_PLUGINS ?= "" COMMERCIAL_AUDIO_PLUGINS ?= ""
# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"