1 |
commit: 24010dcb483cf7284cd8a5db111ae63f0d4e1038 |
2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Sep 23 20:25:22 2016 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 23 20:28:56 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=24010dcb |
7 |
|
8 |
dist: convert to tar.gz |
9 |
|
10 |
This allows the "make dist" target to be used as well as the github |
11 |
archive generation. |
12 |
|
13 |
.gitignore | 2 +- |
14 |
mk/dist.mk | 10 +++++----- |
15 |
2 files changed, 6 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/.gitignore b/.gitignore |
18 |
index d9e27e0..23f644a 100644 |
19 |
--- a/.gitignore |
20 |
+++ b/.gitignore |
21 |
@@ -1,4 +1,4 @@ |
22 |
-*.bz2 |
23 |
+*.gz |
24 |
|
25 |
*.diff |
26 |
*.patch |
27 |
|
28 |
diff --git a/mk/dist.mk b/mk/dist.mk |
29 |
index d127ad7..7d6e139 100644 |
30 |
--- a/mk/dist.mk |
31 |
+++ b/mk/dist.mk |
32 |
@@ -11,9 +11,9 @@ |
33 |
|
34 |
GITREF?= ${VERSION} |
35 |
DISTPREFIX?= ${NAME}-${VERSION} |
36 |
-DISTFILE?= ${DISTPREFIX}.tar.bz2 |
37 |
+DISTFILE?= ${DISTPREFIX}.tar.gz |
38 |
|
39 |
-CLEANFILES+= ${NAME}-*.tar.bz2 |
40 |
+CLEANFILES+= ${NAME}-*.tar.gz |
41 |
|
42 |
CHANGELOG_LIMIT?= --after="1 year ago" |
43 |
|
44 |
@@ -21,13 +21,13 @@ _SNAP_SH= date -u +%Y%m%d%H%M |
45 |
_SNAP:= $(shell ${_SNAP_SH}) |
46 |
SNAP= ${_SNAP} |
47 |
SNAPDIR= ${DISTPREFIX}-${SNAP} |
48 |
-SNAPFILE= ${SNAPDIR}.tar.bz2 |
49 |
+SNAPFILE= ${SNAPDIR}.tar.gz |
50 |
|
51 |
changelog: |
52 |
git log ${CHANGELOG_LIMIT} --format=full > ChangeLog |
53 |
|
54 |
dist: |
55 |
- git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE} |
56 |
+ git archive --prefix=${DISTPREFIX}/ ${GITREF} --output=${DISTFILE} |
57 |
|
58 |
distcheck: dist |
59 |
rm -rf ${DISTPREFIX} |
60 |
@@ -42,7 +42,7 @@ snapshot: |
61 |
cp -RPp * /tmp/${SNAPDIR} |
62 |
(cd /tmp/${SNAPDIR}; make clean) |
63 |
rm -rf /tmp/${SNAPDIR}/.git 2>/dev/null || true |
64 |
- tar -cvjpf ${SNAPFILE} -C /tmp ${SNAPDIR} |
65 |
+ tar -cvzpf ${SNAPFILE} -C /tmp ${SNAPDIR} |
66 |
rm -rf /tmp/${SNAPDIR} |
67 |
ls -l ${SNAPFILE} |