diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-11 14:36:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-21 12:37:53 +0000 |
commit | d0857f4ae3f6e4de3c5258c43aa539b9680bbf25 (patch) | |
tree | b7f9e54a473f10e2640a4bfad44255590aae9400 /meta/classes | |
parent | 6a5a2dff3c8479826131ee1cfafa2ca6385a5c92 (diff) | |
download | poky-d0857f4ae3f6e4de3c5258c43aa539b9680bbf25.tar.gz |
sanity: TMPDIR ABI change for kernel process
The kernel source is being moved into the sysroot, to do this and
preserve previous builds, we need to change the TMPDIR ABI and
provide a function to uninstall all kernels from the sysroot.
This change adds code to do that and increases the ABI number.
(From OE-Core rev: 323f9ea99cff00a751e446286bf8bcf8756e4351)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sanity.bbclass | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5be5efb8a4..2f75558104 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -519,6 +519,16 @@ def sanity_handle_abichanges(status, d): | |||
519 | status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n") | 519 | status.addresult("Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n") |
520 | elif (abi != current_abi and current_abi == "9"): | 520 | elif (abi != current_abi and current_abi == "9"): |
521 | status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n") | 521 | status.addresult("The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n") |
522 | elif (abi != current_abi and current_abi == "10" and (abi == "8" or abi == "9")): | ||
523 | bb.note("Converting staging layout from version 8/9 to layout version 10") | ||
524 | cmd = d.expand("grep -r -l sysroot-providers/virtual_kernel ${SSTATE_MANIFESTS}") | ||
525 | ret, result = oe.utils.getstatusoutput(cmd) | ||
526 | result = result.split() | ||
527 | for f in result: | ||
528 | bb.note("Uninstalling manifest file %s" % f) | ||
529 | sstate_clean_manifest(f, d) | ||
530 | with open(abifile, "w") as f: | ||
531 | f.write(current_abi) | ||
522 | elif (abi != current_abi): | 532 | elif (abi != current_abi): |
523 | # Code to convert from one ABI to another could go here if possible. | 533 | # Code to convert from one ABI to another could go here if possible. |
524 | status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) | 534 | status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)) |