diff options
| -rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 227f1f5a75..d0e669db00 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -623,7 +623,7 @@ python () { | |||
| 623 | if unskipped_pkgs: | 623 | if unskipped_pkgs: |
| 624 | for pkg in skipped_pkgs: | 624 | for pkg in skipped_pkgs: |
| 625 | bb.debug(1, "Skipping the package %s at do_rootfs because of incompatible license(s): %s" % (pkg, ' '.join(skipped_pkgs[pkg]))) | 625 | bb.debug(1, "Skipping the package %s at do_rootfs because of incompatible license(s): %s" % (pkg, ' '.join(skipped_pkgs[pkg]))) |
| 626 | d.setVar('LICENSE_EXCLUSION-' + pkg, ' '.join(skipped_pkgs[pkg])) | 626 | d.setVar('_exclude_incompatible-' + pkg, ' '.join(skipped_pkgs[pkg])) |
| 627 | for pkg in unskipped_pkgs: | 627 | for pkg in unskipped_pkgs: |
| 628 | bb.debug(1, "Including the package %s" % pkg) | 628 | bb.debug(1, "Including the package %s" % pkg) |
| 629 | else: | 629 | else: |
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 ?= "" |
