populate_sdk: Switch from bzip2 to xz
xz gives *much* faster decompression times for the SDK which in itself is a good reason to use it. It also gives better compression. One downside is its slower but we care about the end user case first, build performance secondary. It also assumes the SDK user has a tar capable of understanding a xz compressed file but that should be common enough now. (From OE-Core rev: 193086137b899a0a4e774ffc337ed0da9947fd4f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3341f3fbee
commit
e1a558a434
|
@ -40,7 +40,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
|
|||
TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
|
||||
|
||||
SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
|
||||
SDK_DEPENDS = "virtual/fakeroot-native pbzip2-native"
|
||||
SDK_DEPENDS = "virtual/fakeroot-native xz-native"
|
||||
|
||||
# We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it
|
||||
# could be set to the MACHINE_ARCH
|
||||
|
@ -177,7 +177,7 @@ fakeroot tar_sdk() {
|
|||
# Package it up
|
||||
mkdir -p ${SDK_DEPLOY}
|
||||
cd ${SDK_OUTPUT}/${SDKPATH}
|
||||
tar ${SDKTAROPTS} -cf - . | pbzip2 > ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2
|
||||
tar ${SDKTAROPTS} -cf - . | xz > ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
|
||||
}
|
||||
|
||||
fakeroot create_shar() {
|
||||
|
@ -216,10 +216,10 @@ EOF
|
|||
chmod +x ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
|
||||
|
||||
# append the SDK tarball
|
||||
cat ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 >> ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
|
||||
cat ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz >> ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
|
||||
|
||||
# delete the old tarball, we don't need it anymore
|
||||
rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2
|
||||
rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
|
||||
}
|
||||
|
||||
populate_sdk_log_check() {
|
||||
|
|
|
@ -168,7 +168,7 @@ fi
|
|||
payload_offset=$(($(grep -na -m1 "^MARKER:$" $0|cut -d':' -f1) + 1))
|
||||
|
||||
printf "Extracting SDK..."
|
||||
tail -n +$payload_offset $0| $SUDO_EXEC tar xj -C $target_sdk_dir --checkpoint=.2500
|
||||
tail -n +$payload_offset $0| $SUDO_EXEC tar xJ -C $target_sdk_dir --checkpoint=.2500
|
||||
echo "done"
|
||||
|
||||
printf "Setting it up..."
|
||||
|
|
Loading…
Reference in New Issue