1 |
commit: dcda83a75b1770bcc72fabe6a4ae551a97a2da9f |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 1 12:25:51 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 1 12:25:51 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=dcda83a7 |
7 |
|
8 |
Revert "rolltarball.sh: Create xz compressed tarballs" |
9 |
|
10 |
This reverts commit d8466105dfb6f3323561445488afa300634013b0 |
11 |
because of unresolved issues |
12 |
|
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
rolltarball.sh | 11 +++++------ |
16 |
1 file changed, 5 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/rolltarball.sh b/rolltarball.sh |
19 |
index 2660564..1962c00 100755 |
20 |
--- a/rolltarball.sh |
21 |
+++ b/rolltarball.sh |
22 |
@@ -18,12 +18,11 @@ |
23 |
# 05-Jun-2005 Complete rewrite to clean up code |
24 |
# 20-Apr-2014 Use git instead of svn. Change patchname in ebuild as |
25 |
# well |
26 |
-# 01-Dec-2020 Replace bzip2 with xz to compress tarballs |
27 |
# |
28 |
|
29 |
-# Please increase version number before or on each commit which includes |
30 |
-# changes to this script. |
31 |
-MYVERSION='2.1' |
32 |
+# Please increase version number before each commit which includes changes to |
33 |
+# this script. |
34 |
+MYVERSION='2.0' |
35 |
|
36 |
# ********** Begin functions ********** |
37 |
|
38 |
@@ -434,8 +433,8 @@ build_tarball() { |
39 |
echo ${CURTIME} > ${TB_DIR}/DATESTAMP |
40 |
echo "Packaged by ${G_USER}" >> ${TB_DIR}/DATESTAMP |
41 |
echo "$0 v${MYVERSION}" >> ${TB_DIR}/DATESTAMP |
42 |
- edebug "Create xz-ed tarball ${TB} from ${TB_DIR} excluding vcs files" |
43 |
- tar --create --xz --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9 |
44 |
+ edebug "Create bzip2-ed tarball ${TB} from ${TB_DIR} excluding vcs files" |
45 |
+ tar --create --bzip2 --verbose --exclude-vcs --exclude=*~ --file ${TB} ${TB_DIR} >&9 |
46 |
eend $? "Tarball creation failed" || die |
47 |
edebug "Remove temporary directory" |
48 |
rm -rf ${TB_DIR} || ewarn "Couldn't clean up, manually remove ${TB_DIR}/" |