Khem Raj wrote:
* tmpdir layout is changed bump ABI version to force a rebuild.

Signed-off-by: Khem Raj <[email protected]>

Acked-by: Tom Rini <[email protected]>

---
 classes/sanity.bbclass |    2 ++
 conf/abi_version.conf  |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 8eb7453..cff415a 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -149,6 +149,8 @@ def check_sanity(e):
                        os.system(bb.data.expand("cd ${TMPDIR}/stamps; for i in 
*/*do_populate_staging; do new=`echo $i | sed -e 
's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done", e.data))
                        f = file(abifile, "w")
                        f.write(current_abi)
+               elif abi == "5" and current_abi != "5":
+                       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 != current_abi):
                        # Code to convert from one ABI to another could go here 
if possible.
                        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)
diff --git a/conf/abi_version.conf b/conf/abi_version.conf
index 92b6b58..a59abf6 100644
--- a/conf/abi_version.conf
+++ b/conf/abi_version.conf
@@ -4,7 +4,7 @@
# that breaks the format and have been previously discussed on the mailing list # with general agreement from the core team.
 #
-OELAYOUT_ABI = "4"
+OELAYOUT_ABI = "5"
#
 # DISTRO_PR allows us to regenerate all packages when a fundamental change is


--
Tom Rini
Mentor Graphics Corporation

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Reply via email to