summaryrefslogtreecommitdiff
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:04:49 +0000
commit9256361cf2e929004dcc5615b21fe3c46d9f7740 (patch)
tree36490940e141b1788217abb4959c1954254efbfe
parent72f47df32dce91e3364e3837e2c47bdd2d632571 (diff)
downloadopenembedded-core-9256361cf2e929004dcc5615b21fe3c46d9f7740.tar.gz
openembedded-core-9256361cf2e929004dcc5615b21fe3c46d9f7740.tar.bz2
openembedded-core-9256361cf2e929004dcc5615b21fe3c46d9f7740.zip
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. 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 () {
skipped_pkgs.append(pkg)
else:
unskipped_pkgs.append(pkg)
- some_skipped = skipped_pkgs and unskipped_pkgs
all_skipped = skipped_pkgs and not unskipped_pkgs
- if some_skipped:
+ if unskipped_pkgs:
for pkg in skipped_pkgs:
bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license)
d.setVar('LICENSE_EXCLUSION-' + pkg, 1)