[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 206/246] populate_sdk_ext: fix working with uninative sstate

[Emmanuele Bassi <ebassi src gnome org>]

commit db0832ead63020788f5d10360f0704e9ee280916
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Jan 4 20:48:17 2017 +0200

    populate_sdk_ext: fix working with uninative sstate
    
    Mapped uninative sstate directories to make ext SDK installer to
    use them when it's run on systems with gcc version different from
    gcc version used to build installer.
    
    [YOCTO #10832]
    
    (From OE-Core rev: fb945c0fd2e66d70461e6cf2e602020eeabe32f7)
    
    (From OE-Core rev: 31ce79200035584c26576afe043688132532bc8b)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_ext.bbclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 6d8edca..9269a93 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -224,7 +224,10 @@ python copy_buildsystem () {
             f.write('SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n\n')
 
             # Hide the config information from bitbake output (since it's fixed within the SDK)
-            f.write('BUILDCFG_HEADER = ""\n')
+            f.write('BUILDCFG_HEADER = ""\n\n')
+
+            # Map gcc-dependent uninative sstate cache for installer usage
+            f.write('SSTATE_MIRRORS = "file://universal/(.*) 
file://universal-4.9/\\1\\nfile://universal-4.9/(.*) file://universal-4.8/\\1"\n\n')
 
             # Allow additional config through sdk-extra.conf
             fn = bb.cookerdata.findConfigFile('sdk-extra.conf', d)