]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Simplify the tarball generating scripts
authorHu Keping <hukeping@huawei.com>
Wed, 9 Sep 2020 16:01:17 +0000 (16:01 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 24 Sep 2020 06:03:00 +0000 (08:03 +0200)
As per discussed in issue #12364 [1], since the format of git archive is
inferred from the output file, it's safe to remove the pipe for gzip.

[1] https://github.com/openssl/openssl/issues/12364

Fixes #12364

Signed-off-by: Hu Keping <hukeping@huawei.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12841)

util/mktar.sh

index ec47578f341d025cc040784d3e3b9211e204b5b7..06a1f92150a563267af846e517bd03720116bf08 100755 (executable)
@@ -31,8 +31,7 @@ done
 if [ -z "$TARFILE" ]; then TARFILE="$NAME.tar"; fi
 
 # This counts on .gitattributes to specify what files should be ignored
-git archive --worktree-attributes --format=tar --prefix="$NAME/" -v HEAD \
-    | gzip -9 > "$TARFILE.gz"
+git archive --worktree-attributes -9 --prefix="$NAME/" -o $TARFILE.gz -v HEAD
 
 # Good old way to ensure we display an absolute path
 td=`dirname $TARFILE`