From 97dec8410b071660937fa1f30827a2926c21cca2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 29 Sep 2010 11:19:22 +0100 Subject: sstate.bbclass: Update to use SSTATE variables everywhere and remove the now unneeded complicated paths from the sstate files Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/classes/sanity.bbclass') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 15faa7e43..ef1020b21 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -189,8 +189,13 @@ def check_sanity(e): f = file(abifile, "w") f.write(current_abi) - elif abi == "5" and current_abi != "5": + elif abi == "4": messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n" + elif abi == "5" and current_abi == "6": + bb.note("Converting staging layout from version 5 to layout version 6") + os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data)) + f = file(abifile, "w") + f.write(current_abi) elif (abi != current_abi): # Code to convert from one ABI to another could go here if possible. messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi) -- cgit v1.2.3