From c5d46c1986e6ed9a6b47cc4992fe23965096a139 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 11 Oct 2018 15:08:23 -0700 Subject: [PATCH] Tools: Compress our tarball using threads. Check to see if xz supports threads and enable them if that's the case. Change-Id: I8a0e7100fec98e5b7d7ccd9a987f7782bf7c7512 Reviewed-on: https://code.wireshark.org/review/30137 Reviewed-by: Anders Broman --- tools/git-export-release.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/git-export-release.sh b/tools/git-export-release.sh index 168b87eda3..f19d6c7039 100755 --- a/tools/git-export-release.sh +++ b/tools/git-export-release.sh @@ -41,6 +41,7 @@ fi DESCRIPTION=$(git describe --abbrev=8 --match "v[1-9]*" "${COMMIT}") VERSION=${DESCRIPTION#v} STASH_POP=False +XZ_OPTS= # We might be able to avoid stashing by doing one of the following: # @@ -75,7 +76,9 @@ fi echo "Creating wireshark-$VERSION.tar.xz" -git archive --prefix="wireshark-${VERSION}/" ${COMMIT} | xz > "${DESTDIR}/wireshark-${VERSION}.tar.xz" +echo . | xz --threads=0 > /dev/null 2>&1 && XZ_OPTS=--threads=0 + +git archive --prefix="wireshark-${VERSION}/" ${COMMIT} | xz $XZ_OPTS > "${DESTDIR}/wireshark-${VERSION}.tar.xz" if [ "$STASH_POP" == "True" ] ; then git stash pop