diff options
author | Saul Wold <Saul.Wold@windriver.com> | 2022-02-22 11:23:45 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-25 12:41:24 +0000 |
commit | 92ec600cac0f427d9e8a388c57a4d8afb9d65c36 (patch) | |
tree | 02fbdb9b9b180b7b94488cbbab6cb0851748db21 /meta/classes/package.bbclass | |
parent | 440f07d211841147f2d2b6016a20b75747f45752 (diff) | |
download | poky-92ec600cac0f427d9e8a388c57a4d8afb9d65c36.tar.gz |
package: rename LICENSE_EXCLUSION
By renaming LICENSE_EXCLUSION to _exclude_incompatible, it makes it
clear that this is an internal variable.
(From OE-Core rev: 20a4cc2c2dcf345ef898abfe7735b7bc75ac0059)
Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f4a661ba25..f822258150 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1468,10 +1468,10 @@ python populate_packages () { | |||
1468 | os.umask(oldumask) | 1468 | os.umask(oldumask) |
1469 | os.chdir(workdir) | 1469 | os.chdir(workdir) |
1470 | 1470 | ||
1471 | # Handle LICENSE_EXCLUSION | 1471 | # Handle excluding packages with incompatible licenses |
1472 | package_list = [] | 1472 | package_list = [] |
1473 | for pkg in packages: | 1473 | for pkg in packages: |
1474 | licenses = d.getVar('LICENSE_EXCLUSION-' + pkg) | 1474 | licenses = d.getVar('_exclude_incompatible-' + pkg) |
1475 | if licenses: | 1475 | if licenses: |
1476 | msg = "Excluding %s from packaging as it has incompatible license(s): %s" % (pkg, licenses) | 1476 | msg = "Excluding %s from packaging as it has incompatible license(s): %s" % (pkg, licenses) |
1477 | oe.qa.handle_error("incompatible-license", msg, d) | 1477 | oe.qa.handle_error("incompatible-license", msg, d) |
@@ -2353,7 +2353,7 @@ def gen_packagevar(d, pkgvars="PACKAGEVARS"): | |||
2353 | 2353 | ||
2354 | # Ensure that changes to INCOMPATIBLE_LICENSE re-run do_package for | 2354 | # Ensure that changes to INCOMPATIBLE_LICENSE re-run do_package for |
2355 | # affected recipes. | 2355 | # affected recipes. |
2356 | ret.append('LICENSE_EXCLUSION-%s' % p) | 2356 | ret.append('_exclude_incompatible-%s' % p) |
2357 | return " ".join(ret) | 2357 | return " ".join(ret) |
2358 | 2358 | ||
2359 | PACKAGE_PREPROCESS_FUNCS ?= "" | 2359 | PACKAGE_PREPROCESS_FUNCS ?= "" |