From 831e98325195f5631b977365fd61c3910a2c23a5 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 3 Aug 2016 16:32:14 +0300 Subject: 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] (From OE-Core rev: d7229489c7dfd35164fd107d7944f3c273776118) Signed-off-by: Markus Lehtonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'meta') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 1313fdacb7..ad12db4838 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: -- cgit 1.2.3-korg