diff options
Diffstat (limited to 'meta')
-rw-r--r-- | 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 39f6142741..efb68d25c5 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -242,11 +242,12 @@ python copy_buildsystem () { | |||
242 | 242 | ||
243 | # Copy uninative tarball | 243 | # Copy uninative tarball |
244 | # For now this is where uninative.bbclass expects the tarball | 244 | # For now this is where uninative.bbclass expects the tarball |
245 | uninative_file = d.expand('${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2') | 245 | if bb.data.inherits_class('uninative', d): |
246 | uninative_checksum = bb.utils.sha256_file(uninative_file) | 246 | uninative_file = d.expand('${UNINATIVE_DLDIR}/' + d.getVarFlag("UNINATIVE_CHECKSUM", d.getVar("BUILD_ARCH", True), True) + '/${UNINATIVE_TARBALL}') |
247 | uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum) | 247 | uninative_checksum = bb.utils.sha256_file(uninative_file) |
248 | bb.utils.mkdirhier(uninative_outdir) | 248 | uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum) |
249 | shutil.copy(uninative_file, uninative_outdir) | 249 | bb.utils.mkdirhier(uninative_outdir) |
250 | shutil.copy(uninative_file, uninative_outdir) | ||
250 | 251 | ||
251 | env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE', True) or '').split() | 252 | env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE', True) or '').split() |
252 | env_whitelist_values = {} | 253 | env_whitelist_values = {} |
@@ -659,7 +660,7 @@ def get_sdk_ext_rdepends(d): | |||
659 | do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" | 660 | do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" |
660 | 661 | ||
661 | do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \ | 662 | do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \ |
662 | buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk \ | 663 | buildtools-tarball:do_populate_sdk \ |
663 | ${@'meta-world-pkgdata:do_collect_packagedata' if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1' else ''} \ | 664 | ${@'meta-world-pkgdata:do_collect_packagedata' if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1' else ''} \ |
664 | ${@'meta-extsdk-toolchain:do_locked_sigs' if d.getVar('SDK_INCLUDE_TOOLCHAIN', True) == '1' else ''}" | 665 | ${@'meta-extsdk-toolchain:do_locked_sigs' if d.getVar('SDK_INCLUDE_TOOLCHAIN', True) == '1' else ''}" |
665 | 666 | ||