diff options
Diffstat (limited to 'meta/classes/license.bbclass')
-rw-r--r-- | meta/classes/license.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 69335d650d..10d6ed853a 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -200,7 +200,7 @@ def get_deployed_dependencies(d): | |||
200 | # it might contain the bootloader. | 200 | # it might contain the bootloader. |
201 | taskdata = d.getVar("BB_TASKDEPDATA", False) | 201 | taskdata = d.getVar("BB_TASKDEPDATA", False) |
202 | depends = list(set([dep[0] for dep | 202 | depends = list(set([dep[0] for dep |
203 | in taskdata.itervalues() | 203 | in list(taskdata.values()) |
204 | if not dep[0].endswith("-native")])) | 204 | if not dep[0].endswith("-native")])) |
205 | extra_depends = d.getVar("EXTRA_IMAGEDEPENDS", True) | 205 | extra_depends = d.getVar("EXTRA_IMAGEDEPENDS", True) |
206 | boot_depends = get_boot_dependencies(d) | 206 | boot_depends = get_boot_dependencies(d) |
@@ -261,7 +261,7 @@ def get_boot_dependencies(d): | |||
261 | depends.append(dep) | 261 | depends.append(dep) |
262 | # We need to search for the provider of the dependency | 262 | # We need to search for the provider of the dependency |
263 | else: | 263 | else: |
264 | for taskdep in taskdepdata.itervalues(): | 264 | for taskdep in taskdepdata.values(): |
265 | # The fifth field contains what the task provides | 265 | # The fifth field contains what the task provides |
266 | if dep in taskdep[4]: | 266 | if dep in taskdep[4]: |
267 | info_file = os.path.join( | 267 | info_file = os.path.join( |
@@ -635,7 +635,7 @@ def check_license_format(d): | |||
635 | licenses = d.getVar('LICENSE', True) | 635 | licenses = d.getVar('LICENSE', True) |
636 | from oe.license import license_operator, license_operator_chars, license_pattern | 636 | from oe.license import license_operator, license_operator_chars, license_pattern |
637 | 637 | ||
638 | elements = filter(lambda x: x.strip(), license_operator.split(licenses)) | 638 | elements = list(filter(lambda x: x.strip(), license_operator.split(licenses))) |
639 | for pos, element in enumerate(elements): | 639 | for pos, element in enumerate(elements): |
640 | if license_pattern.match(element): | 640 | if license_pattern.match(element): |
641 | if pos > 0 and license_pattern.match(elements[pos - 1]): | 641 | if pos > 0 and license_pattern.match(elements[pos - 1]): |