summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-25 12:22:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-25 12:32:50 +0000
commit222796ed932d6047b736fa0b8a24dac45c7cc7f7 (patch)
tree1367d6c46b5fbd92367dbba03ff51f89adec95d5 /meta
parent029f8584d547c0792ffbe2f83451dcdfe2a3db7f (diff)
downloadpoky-222796ed932d6047b736fa0b8a24dac45c7cc7f7.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/classes/sstate.bbclass2
-rw-r--r--meta/conf/abi_version.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 258d3345e8..13940f81db 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -301,7 +301,7 @@ def check_sanity(e):
301 f.write(current_abi) 301 f.write(current_abi)
302 elif (abi != current_abi): 302 elif (abi != current_abi):
303 # Code to convert from one ABI to another could go here if possible. 303 # Code to convert from one ABI to another could go here if possible.
304 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) 304 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)
305 else: 305 else:
306 f = file(abifile, "w") 306 f = file(abifile, "w")
307 f.write(current_abi) 307 f.write(current_abi)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index dbe0e46b54..c2dc22e0ac 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -1,4 +1,4 @@
1SSTATE_VERSION = "1" 1SSTATE_VERSION = "2"
2 2
3SSTATE_MANIFESTS = "${TMPDIR}/sstate-control" 3SSTATE_MANIFESTS = "${TMPDIR}/sstate-control"
4SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-" 4SSTATE_MANFILEBASE = "${SSTATE_MANIFESTS}/manifest-${SSTATE_MANMACH}-"
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index 3920766a47..f2919e5b60 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
4# that breaks the format and have been previously discussed on the mailing list 4# that breaks the format and have been previously discussed on the mailing list
5# with general agreement from the core team. 5# with general agreement from the core team.
6# 6#
7OELAYOUT_ABI = "6" 7OELAYOUT_ABI = "7"