From c88832587dd280f61b085b22b677945ed10052e1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Mar 2011 19:57:43 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/sanity.bbclass') 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): 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): -- cgit v1.2.3-54-g00ecf