[oe-commits] [openembedded-core] 01/32: license.bbclass: do not process LICENSE_pn variables
git at git.openembedded.org
git at git.openembedded.org
Tue Aug 23 09:12:16 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 7dfd736905bdcbe937fcb1e3137b67d4a752546d
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Wed Aug 3 16:32:14 2016 +0300
license.bbclass: do not process LICENSE_pn variables
The loop iterating over LICENSE_pn variables has never worked. In
addition, the LICENSE variable is supposed to contain all licenses
defined in LICENSE_pn variables. Thus, it is simpler just to use LICENSE
as the data we get is essentially the same.
[YOCTO #9499]
Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/classes/license.bbclass | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 1313fda..ad12db4 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -387,20 +387,6 @@ def find_license_files(d):
import oe.license
from collections import defaultdict, OrderedDict
- pn = d.getVar('PN', True)
- for package in d.getVar('PACKAGES', True):
- if d.getVar('LICENSE_' + package, True):
- license_types = license_types + ' & ' + \
- d.getVar('LICENSE_' + package, True)
-
- #If we get here with no license types, then that means we have a recipe
- #level license. If so, we grab only those.
- try:
- license_types
- except NameError:
- # All the license types at the recipe level
- license_types = d.getVar('LICENSE', True)
-
# All the license files for the package
lic_files = d.getVar('LIC_FILES_CHKSUM', True)
pn = d.getVar('PN', True)
@@ -498,7 +484,7 @@ def find_license_files(d):
v = FindVisitor()
try:
- v.visit_string(license_types)
+ v.visit_string(d.getVar('LICENSE', True))
except oe.license.InvalidLicense as exc:
bb.fatal('%s: %s' % (d.getVar('PF', True), exc))
except SyntaxError:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list