aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2014-03-04 11:00:40 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2014-03-04 11:00:40 -0800
commit4f9dd2ad7875debf5da68e46e75257e9f0870fed (patch)
treefbfa2ea22e79b119ddbd10a4acc4b57b1636e576
parentBump for new version. (diff)
downloadnetifrc-4f9dd2ad7875debf5da68e46e75257e9f0870fed.tar.gz
netifrc-4f9dd2ad7875debf5da68e46e75257e9f0870fed.tar.bz2
netifrc-4f9dd2ad7875debf5da68e46e75257e9f0870fed.zip
packaging: better dist rule
Improve distfile generation to include a changelog, which is not possible with git-archive Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--.gitignore1
-rw-r--r--mk/dist.mk11
2 files changed, 11 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..56631ab
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+ChangeLog
diff --git a/mk/dist.mk b/mk/dist.mk
index 82fb8cb..383826a 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -14,9 +14,18 @@ SNAP= ${_SNAP}
SNAPDIR= ${DISTPREFIX}-${SNAP}
SNAPFILE= ${SNAPDIR}.tar.bz2
-dist:
+gitdist:
git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
+dist:
+ sh -c ' \
+ D=$$(mktemp -d) && \
+ mkdir $${D}/${DISTPREFIX} && \
+ git checkout-index -f -a --prefix=$${D}/${DISTPREFIX}/ && \
+ git log >$${D}/${DISTPREFIX}/ChangeLog && \
+ tar cjf ${DISTFILE} --owner=0 --group=0 --format=posix --mode=a+rX -C $$D ${DISTPREFIX} && \
+ rm -rf $$D '
+
distcheck: dist
rm -rf ${DISTPREFIX}
tar xf ${DISTFILE}