diff options
| -rw-r--r-- | meta/classes/license.bbclass | 16 |
1 files changed, 1 insertions, 15 deletions
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): | |||
| 387 | import oe.license | 387 | import oe.license |
| 388 | from collections import defaultdict, OrderedDict | 388 | from collections import defaultdict, OrderedDict |
| 389 | 389 | ||
| 390 | pn = d.getVar('PN', True) | ||
| 391 | for package in d.getVar('PACKAGES', True): | ||
| 392 | if d.getVar('LICENSE_' + package, True): | ||
| 393 | license_types = license_types + ' & ' + \ | ||
| 394 | d.getVar('LICENSE_' + package, True) | ||
| 395 | |||
| 396 | #If we get here with no license types, then that means we have a recipe | ||
| 397 | #level license. If so, we grab only those. | ||
| 398 | try: | ||
| 399 | license_types | ||
| 400 | except NameError: | ||
| 401 | # All the license types at the recipe level | ||
| 402 | license_types = d.getVar('LICENSE', True) | ||
| 403 | |||
| 404 | # All the license files for the package | 390 | # All the license files for the package |
| 405 | lic_files = d.getVar('LIC_FILES_CHKSUM', True) | 391 | lic_files = d.getVar('LIC_FILES_CHKSUM', True) |
| 406 | pn = d.getVar('PN', True) | 392 | pn = d.getVar('PN', True) |
| @@ -498,7 +484,7 @@ def find_license_files(d): | |||
| 498 | 484 | ||
| 499 | v = FindVisitor() | 485 | v = FindVisitor() |
| 500 | try: | 486 | try: |
| 501 | v.visit_string(license_types) | 487 | v.visit_string(d.getVar('LICENSE', True)) |
| 502 | except oe.license.InvalidLicense as exc: | 488 | except oe.license.InvalidLicense as exc: |
| 503 | bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) | 489 | bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) |
| 504 | except SyntaxError: | 490 | except SyntaxError: |
