From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 1 Apr 2011 02:57:43 +0000 (-0700)
Subject: sanity.bbclass: Use SSTATE_MANIFESTS instead of hard coding sstate-control
X-Git-Tag: 2011-1~1915
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=246cbbb076ea91eccbc373bd277684f69a8ab4dc;p=openembedded-core.git

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>
---

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):