diff options
author | Ross Burton <ross.burton@intel.com> | 2014-07-16 22:08:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-19 00:09:01 +0100 |
commit | c9a16c563e2452f7ef068e4bd504e7baedb830f0 (patch) | |
tree | f5dbd5ccfe9c1327fa2bfcf58557f47adf7ebca9 /meta/conf | |
parent | ba197e6ff3bd511463d4b64629a1344d593073f2 (diff) | |
download | poky-c9a16c563e2452f7ef068e4bd504e7baedb830f0.tar.gz |
default-distrovars/multilib: update license whitelists to use canonical names
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>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 1bc8e46b8a..8d24d66fc1 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
@@ -23,9 +23,9 @@ IMAGE_FEATURES ?= "" | |||
23 | 23 | ||
24 | # This is a list of packages that are used by the build system to build the distribution, they are not | 24 | # This is a list of packages that are used by the build system to build the distribution, they are not |
25 | # directly part of the distribution. | 25 | # directly part of the distribution. |
26 | HOSTTOOLS_WHITELIST_GPLv3 ?= "" | 26 | HOSTTOOLS_WHITELIST_GPL-3.0 ?= "" |
27 | WHITELIST_GPLv3 ?= "less" | 27 | WHITELIST_GPL-3.0 ?= "less" |
28 | LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime" | 28 | LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime" |
29 | 29 | ||
30 | COMMERCIAL_AUDIO_PLUGINS ?= "" | 30 | COMMERCIAL_AUDIO_PLUGINS ?= "" |
31 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" | 31 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" |