diff options
-rw-r--r-- | meta/classes/license.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/license_image.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index ed91a4b4db..adca881c85 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -268,7 +268,7 @@ def expand_wildcard_licenses(d, wildcard_licenses): | |||
268 | wildcards from SPDXLICENSEMAP flags and SRC_DISTRIBUTE_LICENSES values. | 268 | wildcards from SPDXLICENSEMAP flags and SRC_DISTRIBUTE_LICENSES values. |
269 | """ | 269 | """ |
270 | import fnmatch | 270 | import fnmatch |
271 | licenses = [] | 271 | licenses = wildcard_licenses[:] |
272 | spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys() | 272 | spdxmapkeys = d.getVarFlags('SPDXLICENSEMAP').keys() |
273 | for wld_lic in wildcard_licenses: | 273 | for wld_lic in wildcard_licenses: |
274 | spdxflags = fnmatch.filter(spdxmapkeys, wld_lic) | 274 | spdxflags = fnmatch.filter(spdxmapkeys, wld_lic) |
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 6fb76be48e..2cfda81c99 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass | |||
@@ -40,7 +40,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): | |||
40 | import stat | 40 | import stat |
41 | 41 | ||
42 | bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split() | 42 | bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split() |
43 | bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) | 43 | bad_licenses = [canonical_license(d, l) for l in bad_licenses] |
44 | bad_licenses = expand_wildcard_licenses(d, bad_licenses) | 44 | bad_licenses = expand_wildcard_licenses(d, bad_licenses) |
45 | 45 | ||
46 | with open(license_manifest, "w") as license_file: | 46 | with open(license_manifest, "w") as license_file: |