summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2013-01-15 13:22:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 13:28:06 +0000
commitaac03657ee2faeb6e3d50898a81f2e023c661b9d (patch)
tree4fc0a3cc27b6824a3cf5d1f224a1132dd7037402
parentd597053ce2cc80da0144b5a9ad3a9c9d5ee19f41 (diff)
downloadpoky-aac03657ee2faeb6e3d50898a81f2e023c661b9d.tar.gz
base.bbclass: improve the incompatible license logic a bit
Handle the potential case where the recipe level LICENSE contains an incompatible license, but all of its emitted packages are in fact compatible. Without this adjustment, it would skip such a recipe. (From OE-Core rev: 9256361cf2e929004dcc5615b21fe3c46d9f7740) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 627b9436c2..b427a5e335 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -552,9 +552,8 @@ python () {
552 skipped_pkgs.append(pkg) 552 skipped_pkgs.append(pkg)
553 else: 553 else:
554 unskipped_pkgs.append(pkg) 554 unskipped_pkgs.append(pkg)
555 some_skipped = skipped_pkgs and unskipped_pkgs
556 all_skipped = skipped_pkgs and not unskipped_pkgs 555 all_skipped = skipped_pkgs and not unskipped_pkgs
557 if some_skipped: 556 if unskipped_pkgs:
558 for pkg in skipped_pkgs: 557 for pkg in skipped_pkgs:
559 bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) 558 bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license)
560 d.setVar('LICENSE_EXCLUSION-' + pkg, 1) 559 d.setVar('LICENSE_EXCLUSION-' + pkg, 1)