diff options
-rw-r--r-- | meta/classes/multilib.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 9a1cb1d916..6e143dd70d 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -50,7 +50,7 @@ python multilib_virtclass_handler () { | |||
50 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) | 50 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) |
51 | 51 | ||
52 | # Expand the WHITELISTs with multilib prefix | 52 | # Expand the WHITELISTs with multilib prefix |
53 | for whitelist in ["HOSTTOOLS_WHITELIST_GPLv3", "WHITELIST_GPLv3", "LGPLv2_WHITELIST_GPLv3"]: | 53 | for whitelist in ["HOSTTOOLS_WHITELIST_GPL-3.0", "WHITELIST_GPL-3.0", "LGPLv2_WHITELIST_GPL-3.0"]: |
54 | pkgs = e.data.getVar(whitelist, True) | 54 | pkgs = e.data.getVar(whitelist, True) |
55 | for pkg in pkgs.split(): | 55 | for pkg in pkgs.split(): |
56 | pkgs += " " + variant + "-" + pkg | 56 | pkgs += " " + variant + "-" + pkg |
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" |