summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-31 19:57:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-04 12:19:31 +0100
commit246cbbb076ea91eccbc373bd277684f69a8ab4dc (patch)
tree74815ae767f23d5a745154b9b264e9065707c24d /meta/classes
parent8ca53dd2b8ebf4a6cc4fe509bb89d8e5af3d5c87 (diff)
downloadopenembedded-core-246cbbb076ea91eccbc373bd277684f69a8ab4dc.tar.gz
openembedded-core-246cbbb076ea91eccbc373bd277684f69a8ab4dc.tar.bz2
openembedded-core-246cbbb076ea91eccbc373bd277684f69a8ab4dc.tar.xz
openembedded-core-246cbbb076ea91eccbc373bd277684f69a8ab4dc.zip
sanity.bbclass: Use SSTATE_MANIFESTS instead of hard coding sstate-control
This helps when SSTATE_MANIFESTS is overridden by external layers Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sanity.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 639e1ea61..500a1b2f6 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -321,7 +321,7 @@ def check_sanity(e):
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))
+ os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}", e.data))
f = file(abifile, "w")
f.write(current_abi)
elif (abi != current_abi):