[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3274/8267] classes/populate_sdk_ext: require uninative

[Emmanuele Bassi <ebassi src gnome org>]

commit c56cd49a12645e82d0a16bb94be16ac509f8813c
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Wed Nov 2 16:16:38 2016 +1300

    classes/populate_sdk_ext: require uninative
    
    It seems that possibly due to OE-Core commit
    ac59063bee0e32d0737340974f657341717a6abe, binaries produced without
    uninative aren't compatible with the uninative glibc. I did try earlier
    to ensure that the eSDK could work without uninative since the default
    configuration in OE-Core does not enable it, but it seems like I didn't
    go far enough. Given the practical considerations, just give up and
    require uninative to be enabled in order to build the eSDK. I'm not
    particularly happy about this, but I don't seem much of an alternative.
    
    Fixes [YOCTO #10566].
    
    (From OE-Core rev: b59eee7bebd413c7abe5626f69508e1fe47dd0ac)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/populate_sdk_ext.bbclass |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 944fe5c..a0856d4 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -114,10 +114,6 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath):
             f.write('SSTATE_MIRRORS_forcevariable = ""\n')
             # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it
             f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n')
-            # Drop uninative if the build isn't using it (or else NATIVELSBSTRING will
-            # be different and we won't be able to find our native sstate)
-            if not bb.data.inherits_class('uninative', d):
-                f.write('INHERIT_remove = "uninative"\n')
 
         # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake
         # will not allow in its COREBASE path, so we need to rename the directory temporarily
@@ -612,6 +608,9 @@ fakeroot python do_populate_sdk_ext() {
     if d.getVar('SDK_ARCH', True) != d.getVar('BUILD_ARCH', True):
         bb.fatal('The extensible SDK can currently only be built for the same architecture as the machine 
being built on - SDK_ARCH is set to %s (likely via setting SDKMACHINE) which is different from the 
architecture of the build machine (%s). Unable to continue.' % (d.getVar('SDK_ARCH', True), 
d.getVar('BUILD_ARCH', True)))
 
+    if not bb.data.inherits_class('uninative', d):
+        bb.fatal('The extensible SDK requires uninative to be enabled. Enabling this is straightforward - 
just add the following to your configuration:\n\nrequire 
meta/conf/distro/include/yocto-uninative.inc\nINHERIT += "uninative"\n')
+
     d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d))
     buildtools_fn = get_current_buildtools(d)
     d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))