diff options
Diffstat (limited to 'meta/classes/toaster.bbclass')
-rw-r--r-- | meta/classes/toaster.bbclass | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 4de380bce2..296e4764f0 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass | |||
@@ -328,8 +328,18 @@ python toaster_artifacts() { | |||
328 | if e.taskname in ["do_deploy", "do_image_complete", "do_populate_sdk", "do_populate_sdk_ext"]: | 328 | if e.taskname in ["do_deploy", "do_image_complete", "do_populate_sdk", "do_populate_sdk_ext"]: |
329 | d2 = d.createCopy() | 329 | d2 = d.createCopy() |
330 | d2.setVar('FILE', e.taskfile) | 330 | d2.setVar('FILE', e.taskfile) |
331 | d2.setVar('SSTATE_MANMACH', d2.expand("${MACHINE}")) | 331 | # Use 'stamp-extra-info' if present, else use workaround |
332 | # to determine 'SSTATE_MANMACH' | ||
333 | extrainf = d2.getVarFlag(e.taskname, 'stamp-extra-info') | ||
334 | if extrainf: | ||
335 | d2.setVar('SSTATE_MANMACH', extrainf) | ||
336 | else: | ||
337 | if "do_populate_sdk" == e.taskname: | ||
338 | d2.setVar('SSTATE_MANMACH', d2.expand("${MACHINE}${SDKMACHINE}")) | ||
339 | else: | ||
340 | d2.setVar('SSTATE_MANMACH', d2.expand("${MACHINE}")) | ||
332 | manifest = oe.sstatesig.sstate_get_manifest_filename(e.taskname[3:], d2)[0] | 341 | manifest = oe.sstatesig.sstate_get_manifest_filename(e.taskname[3:], d2)[0] |
342 | |||
333 | if os.access(manifest, os.R_OK): | 343 | if os.access(manifest, os.R_OK): |
334 | with open(manifest) as fmanifest: | 344 | with open(manifest) as fmanifest: |
335 | artifacts = [fname.strip() for fname in fmanifest] | 345 | artifacts = [fname.strip() for fname in fmanifest] |
@@ -356,8 +366,9 @@ do_packagedata_setscene[vardepsexclude] += "toaster_package_dumpdata " | |||
356 | do_package[postfuncs] += "toaster_package_dumpdata " | 366 | do_package[postfuncs] += "toaster_package_dumpdata " |
357 | do_package[vardepsexclude] += "toaster_package_dumpdata " | 367 | do_package[vardepsexclude] += "toaster_package_dumpdata " |
358 | 368 | ||
359 | do_populate_sdk[postfuncs] += "toaster_artifact_dumpdata " | 369 | #do_populate_sdk[postfuncs] += "toaster_artifact_dumpdata " |
360 | do_populate_sdk[vardepsexclude] += "toaster_artifact_dumpdata " | 370 | #do_populate_sdk[vardepsexclude] += "toaster_artifact_dumpdata " |
371 | |||
372 | #do_populate_sdk_ext[postfuncs] += "toaster_artifact_dumpdata " | ||
373 | #do_populate_sdk_ext[vardepsexclude] += "toaster_artifact_dumpdata " | ||
361 | 374 | ||
362 | do_populate_sdk_ext[postfuncs] += "toaster_artifact_dumpdata " | ||
363 | do_populate_sdk_ext[vardepsexclude] += "toaster_artifact_dumpdata " | ||