summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/populate_sdk_ext.bbclass13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 36209954a3..fce9968ba6 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -276,11 +276,12 @@ python copy_buildsystem () {
276 276
277 # Copy uninative tarball 277 # Copy uninative tarball
278 # For now this is where uninative.bbclass expects the tarball 278 # For now this is where uninative.bbclass expects the tarball
279 uninative_file = d.expand('${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2') 279 if bb.data.inherits_class('uninative', d):
280 uninative_checksum = bb.utils.sha256_file(uninative_file) 280 uninative_file = d.expand('${UNINATIVE_DLDIR}/' + d.getVarFlag("UNINATIVE_CHECKSUM", d.getVar("BUILD_ARCH")) + '/${UNINATIVE_TARBALL}')
281 uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum) 281 uninative_checksum = bb.utils.sha256_file(uninative_file)
282 bb.utils.mkdirhier(uninative_outdir) 282 uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum)
283 shutil.copy(uninative_file, uninative_outdir) 283 bb.utils.mkdirhier(uninative_outdir)
284 shutil.copy(uninative_file, uninative_outdir)
284 285
285 env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE') or '').split() 286 env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE') or '').split()
286 env_whitelist_values = {} 287 env_whitelist_values = {}
@@ -695,7 +696,7 @@ def get_sdk_ext_rdepends(d):
695do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" 696do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
696 697
697do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \ 698do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \
698 buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk \ 699 buildtools-tarball:do_populate_sdk \
699 ${@'meta-world-pkgdata:do_collect_packagedata' if d.getVar('SDK_INCLUDE_PKGDATA') == '1' else ''} \ 700 ${@'meta-world-pkgdata:do_collect_packagedata' if d.getVar('SDK_INCLUDE_PKGDATA') == '1' else ''} \
700 ${@'meta-extsdk-toolchain:do_locked_sigs' if d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1' else ''}" 701 ${@'meta-extsdk-toolchain:do_locked_sigs' if d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1' else ''}"
701 702