[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core] [PATCH 2/4] base.bbclass: avoid duplicate call to d.getVar('LICENSE', True)
From: armccurdy () gmail ! com (Andre McCurdy)
Date: 2016-03-31 18:13:07
Message-ID: 1459447989-25263-3-git-send-email-armccurdy () gmail ! com
[Download RAW message or body]
Reuse the 'license' variable, instead of calling
d.getVar('LICENSE', True) again.
Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
---
meta/classes/base.bbclass | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index ab8715e..67b3370 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -516,7 +516,6 @@ python () {
incompatwl.extend((d.getVar(w + spdx_license, True) or \
"").split())
if not pn in whitelist:
- recipe_license = d.getVar('LICENSE', True)
pkgs = d.getVar('PACKAGES', True).split()
skipped_pkgs = []
unskipped_pkgs = []
@@ -528,14 +527,14 @@ python () {
all_skipped = skipped_pkgs and not unskipped_pkgs
if unskipped_pkgs:
for pkg in skipped_pkgs:
- bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs \
because it's " + recipe_license) + bb.debug(1, "SKIPPING the \
package " + pkg + " at do_rootfs because it's " + license) mlprefix = \
d.getVar('MLPREFIX', True)
d.setVar('LICENSE_EXCLUSION-' + mlprefix + pkg, 1)
for pkg in unskipped_pkgs:
bb.debug(1, "INCLUDING the package " + pkg)
elif all_skipped or incompatible_license(d, bad_licenses):
- bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, \
recipe_license))
- raise bb.parse.SkipPackage("incompatible with license %s" % \
recipe_license) + 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:
bb.note("INCLUDING " + pn + " as buildable despite \
INCOMPATIBLE_LICENSE because it has been whitelisted")
--
1.9.1
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic