summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-11-02 16:16:38 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-06 23:35:35 +0000
commitc56cd49a12645e82d0a16bb94be16ac509f8813c (patch)
tree422ae42880e572e21fe935a14161765d08baaebd
parentb95bd4ebe37762659ad097d244da6a47fc4c537f (diff)
downloadpoky-c56cd49a12645e82d0a16bb94be16ac509f8813c.tar.gz
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>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 944fe5cd26..a0856d44f7 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):
114 f.write('SSTATE_MIRRORS_forcevariable = ""\n') 114 f.write('SSTATE_MIRRORS_forcevariable = ""\n')
115 # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it 115 # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it
116 f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n') 116 f.write('TMPDIR_forcevariable = "${TOPDIR}/tmp"\n')
117 # Drop uninative if the build isn't using it (or else NATIVELSBSTRING will
118 # be different and we won't be able to find our native sstate)
119 if not bb.data.inherits_class('uninative', d):
120 f.write('INHERIT_remove = "uninative"\n')
121 117
122 # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake 118 # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake
123 # will not allow in its COREBASE path, so we need to rename the directory temporarily 119 # 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() {
612 if d.getVar('SDK_ARCH', True) != d.getVar('BUILD_ARCH', True): 608 if d.getVar('SDK_ARCH', True) != d.getVar('BUILD_ARCH', True):
613 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))) 609 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)))
614 610
611 if not bb.data.inherits_class('uninative', d):
612 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')
613
615 d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d)) 614 d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d))
616 buildtools_fn = get_current_buildtools(d) 615 buildtools_fn = get_current_buildtools(d)
617 d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) 616 d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))