diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 0e3656b47a..3c3a73c72e 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -114,6 +114,10 @@ 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') | ||
117 | 121 | ||
118 | # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake | 122 | # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake |
119 | # will not allow in its COREBASE path, so we need to rename the directory temporarily | 123 | # will not allow in its COREBASE path, so we need to rename the directory temporarily |
@@ -609,9 +613,6 @@ fakeroot python do_populate_sdk_ext() { | |||
609 | if d.getVar('SDK_ARCH', True) != d.getVar('BUILD_ARCH', True): | 613 | if d.getVar('SDK_ARCH', True) != d.getVar('BUILD_ARCH', True): |
610 | 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 | 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))) |
611 | 615 | ||
612 | if not bb.data.inherits_class('uninative', d): | ||
613 | 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') | ||
614 | |||
615 | d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d)) | 616 | d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d)) |
616 | buildtools_fn = get_current_buildtools(d) | 617 | buildtools_fn = get_current_buildtools(d) |
617 | d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) | 618 | d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) |