From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 070991382C5 for ; Tue, 1 Dec 2020 12:26:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38854E0636; Tue, 1 Dec 2020 12:26:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B9DBE0636 for ; Tue, 1 Dec 2020 12:26:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0074340DAB for ; Tue, 1 Dec 2020 12:26:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67F8A448 for ; Tue, 1 Dec 2020 12:26:11 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1606825551.dcda83a75b1770bcc72fabe6a4ae551a97a2da9f.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: / X-VCS-Repository: proj/apache X-VCS-Files: rolltarball.sh X-VCS-Directories: / X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: dcda83a75b1770bcc72fabe6a4ae551a97a2da9f X-VCS-Branch: master Date: Tue, 1 Dec 2020 12:26:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98b641a4-0fcd-4192-85e7-2f600cc73641 X-Archives-Hash: b13942d493efd4a4a6c585f75221bf05 commit: dcda83a75b1770bcc72fabe6a4ae551a97a2da9f Author: Lars Wendler gentoo org> AuthorDate: Tue Dec 1 12:25:51 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Dec 1 12:25:51 2020 +0000 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=dcda83a7 Revert "rolltarball.sh: Create xz compressed tarballs" This reverts commit d8466105dfb6f3323561445488afa300634013b0 because of unresolved issues Signed-off-by: Lars Wendler gentoo.org> rolltarball.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rolltarball.sh b/rolltarball.sh index 2660564..1962c00 100755 --- a/rolltarball.sh +++ b/rolltarball.sh @@ -18,12 +18,11 @@ # 05-Jun-2005 Complete rewrite to clean up code # 20-Apr-2014 Use git instead of svn. Change patchname in ebuild as # well -# 01-Dec-2020 Replace bzip2 with xz to compress tarballs # -# Please increase version number before or on each commit which includes -# changes to this script. -MYVERSION='2.1' +# Please increase version number before each commit which includes changes to +# this script. +MYVERSION='2.0' # ********** Begin functions ********** @@ -434,8 +433,8 @@ build_tarball() { echo ${CURTIME} > ${TB_DIR}/DATESTAMP echo "Packaged by ${G_USER}" >> ${TB_DIR}/DATESTAMP echo "$0 v${MYVERSION}" >> ${TB_DIR}/DATESTAMP - edebug "Create xz-ed tarball ${TB} from ${TB_DIR} excluding vcs files" - tar --create --xz --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9 + edebug "Create bzip2-ed tarball ${TB} from ${TB_DIR} excluding vcs files" + tar --create --bzip2 --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9 eend $? "Tarball creation failed" || die edebug "Remove temporary directory" rm -rf ${TB_DIR} || ewarn "Couldn't clean up, manually remove ${TB_DIR}/"