diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-08 18:24:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:23:15 +0000 |
| commit | 193086137b899a0a4e774ffc337ed0da9947fd4f (patch) | |
| tree | 00cbd73662102f5a0575197de404cba96fad7a69 | |
| parent | 59a5f596ca29b1eb8283706e3c60fbb39f9c2c23 (diff) | |
| download | openembedded-core-193086137b899a0a4e774ffc337ed0da9947fd4f.tar.gz openembedded-core-193086137b899a0a4e774ffc337ed0da9947fd4f.tar.bz2 openembedded-core-193086137b899a0a4e774ffc337ed0da9947fd4f.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 8 | ||||
| -rw-r--r-- | meta/files/toolchain-shar-extract.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 23dc1156bd..7ca1df67a2 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -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() { diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index de8c66934e..b1ef4b7668 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -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..." |