summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-03-31 11:13:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-31 23:02:27 +0100
commit32a1df86877cd8e70baccd858847fa927508f159 (patch)
treebc0978a1cc0b77af8a771a56124427a9353a74b1
parent8fc8b60005e7641861324c8541fb45058e7aab8e (diff)
downloadopenembedded-core-contrib-32a1df86877cd8e70baccd858847fa927508f159.tar.gz
openembedded-core-contrib-32a1df86877cd8e70baccd858847fa927508f159.tar.bz2
openembedded-core-contrib-32a1df86877cd8e70baccd858847fa927508f159.zip
base.bbclass: avoid duplicate call to d.getVar('LICENSE', True)
Reuse the 'license' variable, instead of calling d.getVar('LICENSE', True) again. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index ab8715e597..67b33706f4 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")