Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 4/4] base.bbclass: minor logic simplification
Date: Thu, 31 Mar 2016 11:13:09 -0700	[thread overview]
Message-ID: <1459447989-25263-5-git-send-email-armccurdy@gmail.com> (raw)
In-Reply-To: <1459447989-25263-1-git-send-email-armccurdy@gmail.com>

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/classes/base.bbclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d91e059..a1e1044 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -515,7 +515,11 @@ python () {
                     if spdx_license:
                         incompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
 
-            if not pn in whitelist:
+            if pn in whitelist:
+                if pn in incompatwl:
+                    p = d.getVar('P', True)
+                    bb.note("INCLUDING " + p + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")
+            else:
                 pkgs = d.getVar('PACKAGES', True).split()
                 skipped_pkgs = []
                 unskipped_pkgs = []
@@ -535,10 +539,6 @@ python () {
                 elif all_skipped or incompatible_license(d, bad_licenses):
                     bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license))
                     raise bb.parse.SkipPackage("incompatible with license %s" % license)
-            elif pn in whitelist:
-                if pn in incompatwl:
-                    p = d.getVar('P', True)
-                    bb.note("INCLUDING " + p + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")
 
     needsrcrev = False
     srcuri = d.getVar('SRC_URI', True)
-- 
1.9.1



      parent reply	other threads:[~2016-03-31 18:13 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-31 18:13 [PATCH 0/4] drop obsolete HOSTTOOLS_WHITELIST_GPL-3.0 etc Andre McCurdy
2016-03-31 18:13 ` [PATCH 1/4] base.bbclass: drop obsolete HOSTTOOLS_WHITELIST_GPL-3.0 Andre McCurdy
2016-03-31 18:13 ` [PATCH 2/4] base.bbclass: avoid duplicate call to d.getVar('LICENSE', True) Andre McCurdy
2016-03-31 18:13 ` [PATCH 3/4] base.bbclass: include PV in 'incompatible license but whitelisted' debug Andre McCurdy
2016-04-15  6:19   ` Richard Purdie
2016-04-15 22:26     ` Andre McCurdy
2016-03-31 18:13 ` Andre McCurdy [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459447989-25263-5-git-send-email-armccurdy@gmail.com \
    --to=armccurdy@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox