[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8265/8267] populate_sdk_ext: Use prebuilt uninative tarball

[Emmanuele Bassi <ebassi src gnome org>]

commit abec40e5ebc6f1b804cf698e365737224a57c41d
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Sat Dec 9 11:06:47 2017 +0000

    populate_sdk_ext: Use prebuilt uninative tarball
    
    For uninative to work, it relies on it being updated to new versions as
    newer glibcs are built. This means the uninative generated by the current
    build may not be as recent as the uninative that is being downloaded by
    uninative.bbclass.
    
    If this occurs, we can get symbol mismatch errors.
    
    Ultimately, the sstate and the uninative versions need to match so we
    should use the same tarball as uninative.bbclass is using, not the one
    we built.
    
    [YOCTO #12405]
    
    (From OE-Core rev: 39fc1150e74173fc6d73c464c141dba0b7ac2930)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_ext.bbclass |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 3620995..fce9968 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -276,11 +276,12 @@ python copy_buildsystem () {
 
     # Copy uninative tarball
     # For now this is where uninative.bbclass expects the tarball
-    uninative_file = d.expand('${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2')
-    uninative_checksum = bb.utils.sha256_file(uninative_file)
-    uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum)
-    bb.utils.mkdirhier(uninative_outdir)
-    shutil.copy(uninative_file, uninative_outdir)
+    if bb.data.inherits_class('uninative', d):
+        uninative_file = d.expand('${UNINATIVE_DLDIR}/' + d.getVarFlag("UNINATIVE_CHECKSUM", 
d.getVar("BUILD_ARCH")) + '/${UNINATIVE_TARBALL}')
+        uninative_checksum = bb.utils.sha256_file(uninative_file)
+        uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum)
+        bb.utils.mkdirhier(uninative_outdir)
+        shutil.copy(uninative_file, uninative_outdir)
 
     env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE') or '').split()
     env_whitelist_values = {}
@@ -695,7 +696,7 @@ def get_sdk_ext_rdepends(d):
 do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
 
 do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \
-                                buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk \
+                                buildtools-tarball:do_populate_sdk \
                                 ${@'meta-world-pkgdata:do_collect_packagedata' if 
d.getVar('SDK_INCLUDE_PKGDATA') == '1' else ''} \
                                 ${@'meta-extsdk-toolchain:do_locked_sigs' if 
d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1' else ''}"