Patchwork [6/6] base.bbclass: improve the incompatible license logic a bit

login
register
mail settings
Submitter Christopher Larson
Date Jan. 15, 2013, 8:22 p.m.
Message ID <5cb12f38b2ac74ea118b58888a0c37f63917fbfa.1358281118.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/42679/
State Accepted
Commit aac03657ee2faeb6e3d50898a81f2e023c661b9d
Headers show

Comments

Christopher Larson - Jan. 15, 2013, 8:22 p.m.
From: Christopher Larson <chris_larson@mentor.com>

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>
---
 meta/classes/base.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Christopher Larson - Jan. 20, 2013, 2:12 a.m.
On Fri, Jan 18, 2013 at 10:02 PM, Saul Wold <sgw@linux.intel.com> wrote:

> Can you please review this as we are closing m3 on Sunday Midnight.
>

Heh, looks like nobody ever really exercised the package exclusion code.
I'll take a look sunday morning if need be.

Patch

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)