[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4301/8267] sanity/abi-version: Force a clean TMPDIR after recipe specific sysroot changes

[Emmanuele Bassi <ebassi src gnome org>]

commit 3b4a36be50bacf45c0eb483e284e990675863fd4
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon Jan 23 23:25:44 2017 +0000

    sanity/abi-version: Force a clean TMPDIR after recipe specific sysroot changes
    
    With the recipe specific sysroots, we need a clean tmpdir, else pseudo-native,
    openssl-native, subversion-native and serf-native need to be manually cleaned.
    After these there are probably more places where software doesn't rebuild correctly
    even if we pass in new parameters to it.
    
    The simplest solution is to force people to start from a clean TMPDIR since
    everything would rebuild anyway.
    
    (From OE-Core rev: da58e27a0f8fc8200f1953f05888834abd79c9f8)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/sanity.bbclass |    2 ++
 meta/conf/abi_version.conf  |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index c9bb034..7bcceee 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -630,6 +630,8 @@ def sanity_handle_abichanges(status, d):
             subprocess.call(d.expand("rm 
${TMPDIR}/sysroots/*/usr/lib/xorg/modules/drivers/modesetting_drv.so 
${TMPDIR}/sysroots/*/pkgdata/runtime/xf86-video-modesetting* 
${TMPDIR}/sysroots/*/pkgdata/runtime-reverse/xf86-video-modesetting* 
${TMPDIR}/sysroots/*/pkgdata/shlibs2/xf86-video-modesetting*"), shell=True)
             with open(abifile, "w") as f:
                 f.write(current_abi)
+        elif abi == "11" and current_abi == "12":
+            status.addresult("The layout of TMPDIR changed for Recipe Specific Sysroots.\nConversion doesn't 
make sense and this change will rebuild everything so please start with a clean TMPDIR.\n")
         elif (abi != current_abi):
             # Code to convert from one ABI to another could go here if possible.
             status.addresult("Error, TMPDIR has changed its layout version number (%s to %s) and you need to 
either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi))
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index a829687..4964880 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
 # that breaks the format and have been previously discussed on the mailing list 
 # with general agreement from the core team.
 #
-OELAYOUT_ABI = "11"
+OELAYOUT_ABI = "12"