sanity/sstate: Due to the sysroot layout changes, the toolchain bootstrap process changes and the recent pseudo bug, bump the tmpdir layout version number and the sstate version numbers
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
029f8584d5
commit
222796ed93
|
@ -301,7 +301,7 @@ def check_sanity(e):
|
||||||
f.write(current_abi)
|
f.write(current_abi)
|
||||||
elif (abi != current_abi):
|
elif (abi != current_abi):
|
||||||
# Code to convert from one ABI to another could go here if possible.
|
# 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)
|
messages = messages + "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)
|
||||||
else:
|
else:
|
||||||
f = file(abifile, "w")
|
f = file(abifile, "w")
|
||||||
f.write(current_abi)
|
f.write(current_abi)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
SSTATE_VERSION = "1"
|
SSTATE_VERSION = "2"
|
||||||
|
|
||||||
SSTATE_MANIFESTS = "${TMPDIR}/sstate-control"
|
SSTATE_MANIFESTS = "${TMPDIR}/sstate-control"
|
||||||
SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
|
SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
# that breaks the format and have been previously discussed on the mailing list
|
# that breaks the format and have been previously discussed on the mailing list
|
||||||
# with general agreement from the core team.
|
# with general agreement from the core team.
|
||||||
#
|
#
|
||||||
OELAYOUT_ABI = "6"
|
OELAYOUT_ABI = "7"
|
||||||
|
|
Loading…
Reference in New Issue