diff options
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r-- | meta/classes/sanity.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 15faa7e431..ef1020b215 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -189,8 +189,13 @@ def check_sanity(e): | |||
189 | 189 | ||
190 | f = file(abifile, "w") | 190 | f = file(abifile, "w") |
191 | f.write(current_abi) | 191 | f.write(current_abi) |
192 | elif abi == "5" and current_abi != "5": | 192 | elif abi == "4": |
193 | 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" | 193 | 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" |
194 | elif abi == "5" and current_abi == "6": | ||
195 | bb.note("Converting staging layout from version 5 to layout version 6") | ||
196 | os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data)) | ||
197 | f = file(abifile, "w") | ||
198 | f.write(current_abi) | ||
194 | elif (abi != current_abi): | 199 | elif (abi != current_abi): |
195 | # Code to convert from one ABI to another could go here if possible. | 200 | # Code to convert from one ABI to another could go here if possible. |
196 | 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) | 201 | 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) |