From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1810413873B for ; Wed, 5 Mar 2014 18:40:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CE25E09DA; Wed, 5 Mar 2014 18:40:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EBCDE09DA for ; Wed, 5 Mar 2014 18:40:03 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8718233BDD7 for ; Wed, 5 Mar 2014 18:40:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 02C5B18875 for ; Wed, 5 Mar 2014 18:40:01 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1393959640.4f9dd2ad7875debf5da68e46e75257e9f0870fed.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: /, mk/ X-VCS-Repository: proj/netifrc X-VCS-Files: .gitignore mk/dist.mk X-VCS-Directories: / mk/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 4f9dd2ad7875debf5da68e46e75257e9f0870fed X-VCS-Branch: master Date: Wed, 5 Mar 2014 18:40:01 +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-Archives-Salt: 6a938c51-5de7-4833-868c-fb1b57389f6f X-Archives-Hash: fc7ed63d3f12461a969941afb2493bb8 commit: 4f9dd2ad7875debf5da68e46e75257e9f0870fed Author: Robin H. Johnson gentoo org> AuthorDate: Tue Mar 4 19:00:40 2014 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Mar 4 19:00:40 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=4f9dd2ad packaging: better dist rule Improve distfile generation to include a changelog, which is not possible with git-archive Signed-off-by: Robin H. Johnson gentoo.org> --- .gitignore | 1 + mk/dist.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) 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}