From: Ben Myers <bpm@sgi.com>
To: Andrew Dahl <adahl@sgi.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 1/4] xfsprogs: Refactor release scripts to conform to using git archive
Date: Thu, 31 Jan 2013 20:10:48 -0600 [thread overview]
Message-ID: <20130201021048.GT27055@sgi.com> (raw)
In-Reply-To: <50F44B62.7060504@sgi.com>
Andrew,
On Mon, Jan 14, 2013 at 12:16:02PM -0600, Andrew Dahl wrote:
> Refactored release scripts to conform to using git archive
>
> When generating a release, there is a risk of missing necessary
> source files. This is fixed by using git archive, which also
> fixes the lack of conformity between the xfs utilities. As well,
> some files may be stale during packaging. This is fixed with a
> clean at the beginning of release generation.
>
> Signed-off-by: Andrew Dahl <adahl@sgi.com>
Compared the old 'make dist' with the new one:
# diff old.list new.list
129a130
> xfsprogs-3.1.10/.gitignore
The only difference in the file list is the addition of .gitignore.
> ---
> Makefile | 11 ++++++++---
> release.sh | 3 +++
> 2 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 0bdc5e8..e73af88 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -29,6 +29,8 @@ SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz
>
> CONFIGURE = aclocal.m4 configure config.guess config.sub install-sh ltmain.sh
> LSRCFILES = configure.ac release.sh README VERSION $(CONFIGURE)
> +SRCTARINC = m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
> + m4/ltversion.m4 po/xfsprogs.pot $(CONFIGURE)
>
> LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
> conftest* built .census install.* install-dev.* *.gz \
> @@ -144,7 +146,10 @@ $(SRCDIR) : $(_FORCE)
> rm -fr $@
> mkdir -p $@
>
> -$(SRCTAR) : default $(SRCDIR)
> - $(Q)$(MAKE) $(MAKEOPTS) source-link
> - unset TAPE; $(TAR) -cf - $(SRCDIR) | $(ZIP) --best > $@ && \
> +$(SRCTAR) : default
> + $(Q)git archive --prefix=$(SRCDIR)/ --format=tar v$(PKG_VERSION) \
> + -o $(SRCDIR).tar
Older versions of git do not support the -o option. I changed this to >
$(SRCDIR).tar and it works fine.
> + $(Q)$(TAR) --transform "s,^,$(SRCDIR)/," -rf $(SRCARC).tar \
SRCDIR
With those changes this looks and works fine.
Reviewed-by: Ben Myers <bpm@sgi.com>
-Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next parent reply other threads:[~2013-02-01 2:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <50F44B2E.9050408@sgi.com>
[not found] ` <50F44B62.7060504@sgi.com>
2013-02-01 2:10 ` Ben Myers [this message]
[not found] ` <50F44B87.3040102@sgi.com>
2013-02-01 2:36 ` [PATCH 2/4] xfsdump: Refactor release scripts to conform to using git archive Ben Myers
[not found] ` <50F44BA5.9030509@sgi.com>
2013-02-01 2:55 ` [PATCH 3/4] xfstests: " Ben Myers
[not found] ` <50F44BC0.80708@sgi.com>
2013-02-01 16:47 ` [PATCH 4/4] dmapi: " Ben Myers
2013-02-01 19:09 ` [PATCH 0/4] " Ben Myers
2013-02-06 1:15 ` Dave Chinner
2013-02-06 6:28 ` Nathan Scott
2013-02-06 19:31 ` [PATCH 0/4] Refactor release scripts to conform to using git?archive Ben Myers
2013-02-06 22:47 ` Dave Chinner
2013-02-14 1:08 ` [PATCH 0/4] Refactor release scripts to conform to using git archive Ben Myers
2013-02-14 2:14 ` Nathan Scott
2013-02-14 16:24 ` Ben Myers
2013-02-14 16:54 ` xfsprogs: update 'make deb' to use tarball Ben Myers
2013-02-14 22:26 ` Nathan Scott
2013-02-14 22:50 ` Dave Chinner
2013-02-14 17:31 ` xfsdump: update 'make deb' to use tarball archive Ben Myers
2013-02-14 22:27 ` Nathan Scott
2013-02-14 22:51 ` Dave Chinner
2013-02-14 22:25 ` [PATCH 0/4] Refactor release scripts to conform to using git archive Nathan Scott
2013-02-14 22:37 ` Ben Myers
2013-02-14 22:36 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130201021048.GT27055@sgi.com \
--to=bpm@sgi.com \
--cc=adahl@sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox