diff options
author | Khem Raj <raj.khem@gmail.com> | 2011-03-31 19:57:43 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-04 14:08:09 +0100 |
commit | c88832587dd280f61b085b22b677945ed10052e1 (patch) | |
tree | dc9b7a93c907d40b5ff8984e9601712f85258cb7 /meta | |
parent | 9f20f5e29f10e16c0f5faa59b7ac5d427aa15767 (diff) | |
download | poky-c88832587dd280f61b085b22b677945ed10052e1.tar.gz |
sanity.bbclass: Use SSTATE_MANIFESTS instead of hard coding sstate-control
This helps when SSTATE_MANIFESTS is overridden by external layers
(From OE-Core rev: 246cbbb076ea91eccbc373bd277684f69a8ab4dc)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sanity.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 639e1ea61a..500a1b2f69 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -321,7 +321,7 @@ def check_sanity(e): | |||
321 | 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" | 321 | 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" |
322 | elif abi == "5" and current_abi == "6": | 322 | elif abi == "5" and current_abi == "6": |
323 | bb.note("Converting staging layout from version 5 to layout version 6") | 323 | bb.note("Converting staging layout from version 5 to layout version 6") |
324 | os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data)) | 324 | os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}", e.data)) |
325 | f = file(abifile, "w") | 325 | f = file(abifile, "w") |
326 | f.write(current_abi) | 326 | f.write(current_abi) |
327 | elif (abi != current_abi): | 327 | elif (abi != current_abi): |