xfs
[Top] [All Lists]

Re: [PATCH 2/4] xfsdump: Refactor release scripts to conform to using gi

To: Andrew Dahl <adahl@xxxxxxx>
Subject: Re: [PATCH 2/4] xfsdump: Refactor release scripts to conform to using git archive
From: Ben Myers <bpm@xxxxxxx>
Date: Thu, 31 Jan 2013 20:36:06 -0600
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <50F44B87.3040102@xxxxxxx>
References: <50F44B2E.9050408@xxxxxxx> <50F44B87.3040102@xxxxxxx>
User-agent: Mutt/1.5.20 (2009-06-14)
Andrew,

On Mon, Jan 14, 2013 at 12:16:39PM -0600, Andrew Dahl wrote:
> Refactored release scripts to conform to using git archive
> 
> When generating a release, there is a risk of some files being
> stale, such as configure and the m4/autotools temp files. This
> is fixed with a clean at the beginning of the release generation.
> In addition, there is no uniformity in the current method of
> source tar generation between xfs utilities. Using git archive
> solves this issue accross all utilities.
> 
> Signed-off-by: Andrew Dahl <adahl@xxxxxxx>

Here is the difference between the old 'make dist' and the new one:

# diff old.list new.list
99a100
> xfsdump-3.1.2/.gitignore
190d190
< xfsdump-3.1.2/po/xfsdump.pot

Adding .gitignore is fine, and xfsdump.pot needn't be in the archive, it is an
output file from gettext.

> diff --git a/Makefile b/Makefile
> index 39881af..23b6a9e 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 $(CONFIGURE)
>  
>  LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
>       conftest* built .census install.* install-dev.* *.gz \
> @@ -124,7 +126,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

Changed this to 

 > $(SRCDIR).tar

Reviewed-by: Ben Myers <bpm@xxxxxxx>

Regards,
        Ben

<Prev in Thread] Current Thread [Next in Thread>