[oe-commits] Christopher Larson : base.bbclass: improve the incompatible license logic a bit

git at git.openembedded.org git at git.openembedded.org
Fri Jan 18 13:31:16 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 9256361cf2e929004dcc5615b21fe3c46d9f7740
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9256361cf2e929004dcc5615b21fe3c46d9f7740

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Tue Jan 15 13:22:51 2013 -0700

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 at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/base.bbclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 627b943..b427a5e 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)





More information about the Openembedded-commits mailing list