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: 1bde969058f7e832db0e7eb9c6f7ef00f027628c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
2021e95bcd
commit
b366f7eccc
|
@ -243,11 +243,12 @@ python copy_buildsystem () {
|
||||||
|
|
||||||
# Copy uninative tarball
|
# Copy uninative tarball
|
||||||
# For now this is where uninative.bbclass expects the tarball
|
# For now this is where uninative.bbclass expects the tarball
|
||||||
uninative_file = d.expand('${SDK_DEPLOY}/${BUILD_ARCH}-nativesdk-libc.tar.bz2')
|
if bb.data.inherits_class('uninative', d):
|
||||||
uninative_checksum = bb.utils.sha256_file(uninative_file)
|
uninative_file = d.expand('${UNINATIVE_DLDIR}/' + d.getVarFlag("UNINATIVE_CHECKSUM", d.getVar("BUILD_ARCH")) + '/${UNINATIVE_TARBALL}')
|
||||||
uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum)
|
uninative_checksum = bb.utils.sha256_file(uninative_file)
|
||||||
bb.utils.mkdirhier(uninative_outdir)
|
uninative_outdir = '%s/downloads/uninative/%s' % (baseoutpath, uninative_checksum)
|
||||||
shutil.copy(uninative_file, uninative_outdir)
|
bb.utils.mkdirhier(uninative_outdir)
|
||||||
|
shutil.copy(uninative_file, uninative_outdir)
|
||||||
|
|
||||||
env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE') or '').split()
|
env_whitelist = (d.getVar('BB_ENV_EXTRAWHITE') or '').split()
|
||||||
env_whitelist_values = {}
|
env_whitelist_values = {}
|
||||||
|
@ -656,7 +657,7 @@ def get_sdk_ext_rdepends(d):
|
||||||
do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
|
do_populate_sdk_ext[dirs] = "${@d.getVarFlag('do_populate_sdk', 'dirs', False)}"
|
||||||
|
|
||||||
do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \
|
do_populate_sdk_ext[depends] = "${@d.getVarFlag('do_populate_sdk', 'depends', False)} \
|
||||||
buildtools-tarball:do_populate_sdk uninative-tarball:do_populate_sdk \
|
buildtools-tarball:do_populate_sdk \
|
||||||
${@'meta-world-pkgdata:do_collect_packagedata' if d.getVar('SDK_INCLUDE_PKGDATA') == '1' else ''} \
|
${@'meta-world-pkgdata:do_collect_packagedata' if d.getVar('SDK_INCLUDE_PKGDATA') == '1' else ''} \
|
||||||
${@'meta-extsdk-toolchain:do_locked_sigs' if d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1' else ''}"
|
${@'meta-extsdk-toolchain:do_locked_sigs' if d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1' else ''}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue