From: Ben Myers <bpm@sgi.com>
To: Andrew Dahl <adahl@sgi.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH 3/4] xfstests: Refactor release scripts to conform to using git archive
Date: Thu, 31 Jan 2013 20:55:53 -0600 [thread overview]
Message-ID: <20130201025553.GV27055@sgi.com> (raw)
In-Reply-To: <50F44BA5.9030509@sgi.com>
Andrew,
On Mon, Jan 14, 2013 at 12:17:09PM -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 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 across all utilities.
>
> Signed-off-by: Andrew Dahl <adahl@sgi.com>
> ---
> Makefile | 20 ++++++++++++++++++++
> release.sh | 11 +++++++++--
> 2 files changed, 29 insertions(+), 2 deletions(-)
> mode change 100644 => 100755 release.sh
>
> diff --git a/Makefile b/Makefile
> index b68ec11..a0aef85 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -39,12 +39,17 @@ ifeq ($(HAVE_BUILDDEFS), yes)
> include $(TOPDIR)/include/builddefs
> endif
>
> +SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz
> +
> TESTS = $(shell sed -n -e '/^[0-9][0-9][0-9]*/s/ .*//p' group)
> CONFIGURE = configure include/builddefs include/config.h
> LSRCFILES = configure configure.ac aclocal.m4 README VERSION
> LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
> conftest* check.log check.time
>
> +ifeq ($(HAVE_BUILDDEFS), yes)
> +LDIRT += $(SRCTAR)
> +endif
>
> LIB_SUBDIRS = include lib
> TOOL_SUBDIRS = ltp src m4
> @@ -102,3 +107,18 @@ install-dev install-lib:
> realclean distclean: clean
> $(Q)rm -f $(LDIRT) $(CONFIGURE)
> $(Q)rm -rf autom4te.cache Logs
> +
> +dist: include/builddefs include/config.h default
> +ifeq ($(HAVE_BUILDDEFS), no)
> + $(Q)$(MAKE) $(MAKEOPTS) -C . $@
> +else
> + $(Q)$(MAKE) $(MAKEOPTS) $(SRCTAR)
> +endif
> +
> +$(SRCTAR) : default
> + $(Q)git archive --prefix=$(PKG_NAME)-$(PKG_VERSION)/ --format=tar \
> + v$(PKG_VERSION) -o $(PKG_NAME)-$(PKG_VERSION).tar
Again, changed this to
> $(PKG_NAME)-$(PKG_VERSION).tar
And it worked fine.
Reviewed-by: Ben Myers <bpm@sgi.com>
Regards,
Ben
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-02-01 2:55 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 ` [PATCH 1/4] xfsprogs: Refactor release scripts to conform to using git archive Ben Myers
[not found] ` <50F44B87.3040102@sgi.com>
2013-02-01 2:36 ` [PATCH 2/4] xfsdump: " Ben Myers
[not found] ` <50F44BA5.9030509@sgi.com>
2013-02-01 2:55 ` Ben Myers [this message]
[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=20130201025553.GV27055@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