summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-09 10:59:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-11 21:47:28 (GMT)
commita3765887d3efa4c464ef7a00450f218ae2b15eb2 (patch)
treeab765b4a91168a262b8b3798ffeb0f72ca23fe64
parent590ef99df74581e6b7595e545c12594012653de8 (diff)
downloadpoky-a3765887d3efa4c464ef7a00450f218ae2b15eb2.tar.gz
populate_sdk_ext: Use prebuilt uninative tarball
For uninative to work, it relies on it being updated to new versions as newer glibcs are built. This means the uninative generated by the current build may not be as recent as the uninative that is being downloaded by uninative.bbclass. If this occurs, we can get symbol mismatch errors. Ultimately, the sstate and the uninative versions need to match so we should use the same tarball as uninative.bbclass is using, not the one we built. [YOCTO #12405] (From OE-Core rev: 1e6beee55d2bbe40de54c09f7a48fcb1240a426e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 39f6142..efb68d2 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):
659do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}" 660do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
660 661
661do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \ 662do_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