diff options
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 9 | ||||
-rw-r--r-- | meta/lib/oe/copy_buildsystem.py | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 317043d890..3a65c07a51 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -171,10 +171,9 @@ python copy_buildsystem () { | |||
171 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) | 171 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) |
172 | 172 | ||
173 | # Filter the locked signatures file to just the sstate tasks we are interested in | 173 | # Filter the locked signatures file to just the sstate tasks we are interested in |
174 | allowed_tasks = ['do_populate_lic', 'do_populate_sysroot', 'do_packagedata', 'do_package_write_ipk', 'do_package_write_rpm', 'do_package_write_deb', 'do_package_qa', 'do_deploy'] | ||
175 | excluded_targets = d.getVar('SDK_TARGETS', True) | 174 | excluded_targets = d.getVar('SDK_TARGETS', True) |
176 | lockedsigs_pruned = baseoutpath + '/conf/locked-sigs.inc' | 175 | lockedsigs_pruned = baseoutpath + '/conf/locked-sigs.inc' |
177 | oe.copy_buildsystem.prune_lockedsigs(allowed_tasks, | 176 | oe.copy_buildsystem.prune_lockedsigs([], |
178 | excluded_targets, | 177 | excluded_targets, |
179 | sigfile, | 178 | sigfile, |
180 | lockedsigs_pruned) | 179 | lockedsigs_pruned) |
@@ -187,6 +186,12 @@ python copy_buildsystem () { | |||
187 | d.getVar('SSTATE_DIR', True), | 186 | d.getVar('SSTATE_DIR', True), |
188 | sstate_out, d, | 187 | sstate_out, d, |
189 | fixedlsbstring) | 188 | fixedlsbstring) |
189 | # We don't need sstate do_package files | ||
190 | for root, dirs, files in os.walk(sstate_out): | ||
191 | for name in files: | ||
192 | if name.endswith("_package.tgz"): | ||
193 | f = os.path.join(root, name) | ||
194 | os.remove(f) | ||
190 | } | 195 | } |
191 | 196 | ||
192 | def extsdk_get_buildtools_filename(d): | 197 | def extsdk_get_buildtools_filename(d): |
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index 15af4eb84b..a5ca3df320 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py | |||
@@ -75,7 +75,7 @@ def generate_locked_sigs(sigfile, d): | |||
75 | tasks = ['%s.%s' % (v[2], v[1]) for v in depd.itervalues()] | 75 | tasks = ['%s.%s' % (v[2], v[1]) for v in depd.itervalues()] |
76 | bb.parse.siggen.dump_lockedsigs(sigfile, tasks) | 76 | bb.parse.siggen.dump_lockedsigs(sigfile, tasks) |
77 | 77 | ||
78 | def prune_lockedsigs(allowed_tasks, excluded_targets, lockedsigs, pruned_output): | 78 | def prune_lockedsigs(excluded_tasks, excluded_targets, lockedsigs, pruned_output): |
79 | with open(lockedsigs, 'r') as infile: | 79 | with open(lockedsigs, 'r') as infile: |
80 | bb.utils.mkdirhier(os.path.dirname(pruned_output)) | 80 | bb.utils.mkdirhier(os.path.dirname(pruned_output)) |
81 | with open(pruned_output, 'w') as f: | 81 | with open(pruned_output, 'w') as f: |
@@ -84,7 +84,7 @@ def prune_lockedsigs(allowed_tasks, excluded_targets, lockedsigs, pruned_output) | |||
84 | if invalue: | 84 | if invalue: |
85 | if line.endswith('\\\n'): | 85 | if line.endswith('\\\n'): |
86 | splitval = line.strip().split(':') | 86 | splitval = line.strip().split(':') |
87 | if splitval[1] in allowed_tasks and not splitval[0] in excluded_targets: | 87 | if not splitval[1] in excluded_tasks and not splitval[0] in excluded_targets: |
88 | f.write(line) | 88 | f.write(line) |
89 | else: | 89 | else: |
90 | f.write(line) | 90 | f.write(line) |