diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 16:31:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 23:32:39 +0100 |
commit | 1fc840ffc0267ecf3a15c4a59ab44869ef1d6339 (patch) | |
tree | b2932a0d0d7146bde799db47497236063050fc84 /meta/lib/oe/copy_buildsystem.py | |
parent | 22c8ed6484e0ee9328e3844c9e794f3d89ebb9f7 (diff) | |
download | poky-1fc840ffc0267ecf3a15c4a59ab44869ef1d6339.tar.gz |
meta: python3 megapatch
This needs splutting into smaller units, WIP atm.
(From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/copy_buildsystem.py')
-rw-r--r-- | meta/lib/oe/copy_buildsystem.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index 7b9a0ee065..eddf5bb2da 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py | |||
@@ -124,7 +124,7 @@ class BuildSystem(object): | |||
124 | def generate_locked_sigs(sigfile, d): | 124 | def generate_locked_sigs(sigfile, d): |
125 | bb.utils.mkdirhier(os.path.dirname(sigfile)) | 125 | bb.utils.mkdirhier(os.path.dirname(sigfile)) |
126 | depd = d.getVar('BB_TASKDEPDATA', False) | 126 | depd = d.getVar('BB_TASKDEPDATA', False) |
127 | tasks = ['%s.%s' % (v[2], v[1]) for v in depd.itervalues()] | 127 | tasks = ['%s.%s' % (v[2], v[1]) for v in depd.values()] |
128 | bb.parse.siggen.dump_lockedsigs(sigfile, tasks) | 128 | bb.parse.siggen.dump_lockedsigs(sigfile, tasks) |
129 | 129 | ||
130 | def prune_lockedsigs(excluded_tasks, excluded_targets, lockedsigs, pruned_output): | 130 | def prune_lockedsigs(excluded_tasks, excluded_targets, lockedsigs, pruned_output): |
@@ -195,7 +195,7 @@ def merge_lockedsigs(copy_tasks, lockedsigs_main, lockedsigs_extra, merged_outpu | |||
195 | fulltypes.append(typename) | 195 | fulltypes.append(typename) |
196 | f.write('SIGGEN_LOCKEDSIGS_TYPES = "%s"\n' % ' '.join(fulltypes)) | 196 | f.write('SIGGEN_LOCKEDSIGS_TYPES = "%s"\n' % ' '.join(fulltypes)) |
197 | 197 | ||
198 | write_sigs_file(copy_output, tocopy.keys(), tocopy) | 198 | write_sigs_file(copy_output, list(tocopy.keys()), tocopy) |
199 | if merged_output: | 199 | if merged_output: |
200 | write_sigs_file(merged_output, arch_order, merged) | 200 | write_sigs_file(merged_output, arch_order, merged) |
201 | 201 | ||