summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/base.bbclass4
-rw-r--r--meta/classes/license.bbclass2
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/lib/oeqa/selftest/cases/distrodata.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb4
-rwxr-xr-xscripts/contrib/convert-variable-renames.py1
7 files changed, 10 insertions, 8 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 87a4cb5fc7..be820ddb2c 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -542,9 +542,9 @@ python () {
542 unmatched_license_flags = check_license_flags(d) 542 unmatched_license_flags = check_license_flags(d)
543 if unmatched_license_flags: 543 if unmatched_license_flags:
544 if len(unmatched_license_flags) == 1: 544 if len(unmatched_license_flags) == 1:
545 message = "because it has a restricted license '{0}'. Which is not whitelisted in LICENSE_FLAGS_WHITELIST".format(unmatched_license_flags[0]) 545 message = "because it has a restricted license '{0}'. Which is not whitelisted in LICENSE_FLAGS_ACCEPTED".format(unmatched_license_flags[0])
546 else: 546 else:
547 message = "because it has restricted licenses {0}. Which are not whitelisted in LICENSE_FLAGS_WHITELIST".format( 547 message = "because it has restricted licenses {0}. Which are not whitelisted in LICENSE_FLAGS_ACCEPTED".format(
548 ", ".join("'{0}'".format(f) for f in unmatched_license_flags)) 548 ", ".join("'{0}'".format(f) for f in unmatched_license_flags))
549 bb.debug(1, "Skipping %s %s" % (pn, message)) 549 bb.debug(1, "Skipping %s %s" % (pn, message))
550 raise bb.parse.SkipRecipe(message) 550 raise bb.parse.SkipRecipe(message)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index d5480d87e2..dd1e07ee37 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -392,7 +392,7 @@ def check_license_flags(d):
392 392
393 license_flags = d.getVar('LICENSE_FLAGS') 393 license_flags = d.getVar('LICENSE_FLAGS')
394 if license_flags: 394 if license_flags:
395 whitelist = d.getVar('LICENSE_FLAGS_WHITELIST') 395 whitelist = d.getVar('LICENSE_FLAGS_ACCEPTED')
396 if not whitelist: 396 if not whitelist:
397 return license_flags.split() 397 return license_flags.split()
398 unmatched_flags = all_license_flags_match(license_flags, whitelist) 398 unmatched_flags = all_license_flags_match(license_flags, whitelist)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 3af649ce59..6fb7bfeb23 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -108,6 +108,7 @@ BB_RENAMED_VARIABLES[ICECC_USER_PACKAGE_BL] = "ICECC_RECIPE_DISABLE"
108BB_RENAMED_VARIABLES[ICECC_SYSTEM_PACKAGE_BL] = "ICECC_RECIPE_DISABLE" 108BB_RENAMED_VARIABLES[ICECC_SYSTEM_PACKAGE_BL] = "ICECC_RECIPE_DISABLE"
109BB_RENAMED_VARIABLES[INHERIT_BLACKLIST] = "is a deprecated variable and no longer needed" 109BB_RENAMED_VARIABLES[INHERIT_BLACKLIST] = "is a deprecated variable and no longer needed"
110BB_RENAMED_VARIABLES[TUNEABI_WHITELIST] = "is a deprecated variable and support has been removed" 110BB_RENAMED_VARIABLES[TUNEABI_WHITELIST] = "is a deprecated variable and support has been removed"
111BB_RENAMED_VARIABLES[LICENSE_FLAGS_WHITELIST] = "LICENSE_FLAGS_ACCEPTED"
111 112
112################################################################## 113##################################################################
113# Architecture-dependent build variables. 114# Architecture-dependent build variables.
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index 908979804a..03f31e9fcb 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -18,7 +18,7 @@ class Distrodata(OESelftestTestCase):
18 Product: oe-core 18 Product: oe-core
19 Author: Alexander Kanavin <alex.kanavin@gmail.com> 19 Author: Alexander Kanavin <alex.kanavin@gmail.com>
20 """ 20 """
21 feature = 'LICENSE_FLAGS_WHITELIST += " commercial"\n' 21 feature = 'LICENSE_FLAGS_ACCEPTED += " commercial"\n'
22 self.write_config(feature) 22 self.write_config(feature)
23 23
24 pkgs = oe.recipeutils.get_recipe_upgrade_status() 24 pkgs = oe.recipeutils.get_recipe_upgrade_status()
@@ -99,7 +99,7 @@ The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIP
99 return True 99 return True
100 return False 100 return False
101 101
102 feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_WHITELIST += " commercial"\nPARSE_ALL_RECIPES = "1"\nPACKAGE_CLASSES = "package_ipk package_deb package_rpm"\n' 102 feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_ACCEPTED += " commercial"\nPARSE_ALL_RECIPES = "1"\nPACKAGE_CLASSES = "package_ipk package_deb package_rpm"\n'
103 self.write_config(feature) 103 self.write_config(feature)
104 104
105 with bb.tinfoil.Tinfoil() as tinfoil: 105 with bb.tinfoil.Tinfoil() as tinfoil:
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index e539365031..7caf8c3e7d 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -206,7 +206,7 @@ class ReproducibleTests(OESelftestTestCase):
206 PACKAGE_CLASSES = "{package_classes}" 206 PACKAGE_CLASSES = "{package_classes}"
207 INHIBIT_PACKAGE_STRIP = "1" 207 INHIBIT_PACKAGE_STRIP = "1"
208 TMPDIR = "{tmpdir}" 208 TMPDIR = "{tmpdir}"
209 LICENSE_FLAGS_WHITELIST = "commercial" 209 LICENSE_FLAGS_ACCEPTED = "commercial"
210 DISTRO_FEATURES:append = ' systemd pam' 210 DISTRO_FEATURES:append = ' systemd pam'
211 USERADDEXTENSION = "useradd-staticids" 211 USERADDEXTENSION = "useradd-staticids"
212 USERADD_ERROR_DYNAMIC = "skip" 212 USERADD_ERROR_DYNAMIC = "skip"
diff --git a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb
index 8b4e339436..02282ac5d9 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-examples_1.18.6.bb
@@ -30,6 +30,6 @@ RDEPENDS:${PN} = "gstreamer1.0-plugins-base-playback"
30RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \ 30RRECOMMENDS:${PN} = "gstreamer1.0-plugins-base-meta \
31 gstreamer1.0-plugins-good-meta \ 31 gstreamer1.0-plugins-good-meta \
32 gstreamer1.0-plugins-bad-meta \ 32 gstreamer1.0-plugins-bad-meta \
33 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-libav", "", d)} \ 33 ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-libav", "", d)} \
34 ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}" 34 ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "gstreamer1.0-plugins-ugly-meta", "", d)}"
35RPROVIDES:${PN} += "gst-player gst-player-bin" 35RPROVIDES:${PN} += "gst-player gst-player-bin"
diff --git a/scripts/contrib/convert-variable-renames.py b/scripts/contrib/convert-variable-renames.py
index bc3e01887c..fca59ca9e1 100755
--- a/scripts/contrib/convert-variable-renames.py
+++ b/scripts/contrib/convert-variable-renames.py
@@ -42,6 +42,7 @@ renames = {
42"ICECC_USER_PACKAGE_WL" : "ICECC_RECIPE_ENABLE", 42"ICECC_USER_PACKAGE_WL" : "ICECC_RECIPE_ENABLE",
43"ICECC_USER_PACKAGE_BL" : "ICECC_RECIPE_DISABLE", 43"ICECC_USER_PACKAGE_BL" : "ICECC_RECIPE_DISABLE",
44"ICECC_SYSTEM_PACKAGE_BL" : "ICECC_RECIPE_DISABLE", 44"ICECC_SYSTEM_PACKAGE_BL" : "ICECC_RECIPE_DISABLE",
45"LICENSE_FLAGS_WHITELIST" : "LICENSE_FLAGS_ACCEPTED",
45} 46}
46 47
47removed_list = [ 48removed_list = [