diff options
| author | Ben Myers <bpm@sgi.com> | 2013-02-14 11:31:20 -0600 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-02-19 14:29:41 -0600 |
| commit | 71f940f36b24c4f3e080488080d0372adfcd718c (patch) | |
| tree | 14427e50e0f9ebd6aa508907d70532c825abeb26 | |
| parent | ef0b99a1b4ad1ddc01136cdf1b77db67ac83659f (diff) | |
| download | xfsdump-dev-71f940f36b24c4f3e080488080d0372adfcd718c.tar.gz | |
xfsdump: update 'make deb' to use tarball archive
This patch changes the build process so that 'make deb' uses the same
process of creating a source tree as the release script.
* Add a list of files which go in the release tarball in .gitcensus
This is needed so that you can create a tarball in a bare release
tree, when .git is not available.
* Modify the SRCTAR target to include files from .gitcensus and use tar
instead of git archive.
* Modify the SRCTARINC files to include .gitcensus, and include
.gitcensus in the 'make realclean' target.
* remove the 'make source-link' target.
Signed-off-by: Ben Myers <bpm@sgi.com>
Reviewed-by: Nathan Scott <nathans@debian.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | include/buildrules | 11 |
3 files changed, 13 insertions, 22 deletions
@@ -4,6 +4,7 @@ # build system .census +.gitcensus /include/config.h /include/builddefs /install-sh @@ -30,7 +30,7 @@ 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) + m4/ltversion.m4 .gitcensus $(CONFIGURE) LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \ conftest* built .census install.* install-dev.* *.gz \ @@ -100,7 +100,7 @@ distclean: clean rm -f $(LDIRT) realclean: distclean - rm -f $(CONFIGURE) + rm -f $(CONFIGURE) .gitcensus # # All this gunk is to allow for a make dist on an unconfigured tree @@ -117,18 +117,19 @@ ifeq ($(HAVE_BUILDDEFS), no) $(MAKE) $(MAKEOPTS) -C . $@ else $(Q)$(MAKE) $(MAKEOPTS) $(SRCDIR) - $(Q)$(MAKE) $(MAKEOPTS) -C po - $(Q)$(MAKE) $(MAKEOPTS) source-link $(Q)cd $(SRCDIR) && dpkg-buildpackage endif -$(SRCDIR) : $(_FORCE) +$(SRCDIR) : $(_FORCE) $(SRCTAR) rm -fr $@ - mkdir -p $@ + $(Q)$(TAR) -zxvf $(SRCTAR) -$(SRCTAR) : default - $(Q)git archive --prefix=$(SRCDIR)/ --format=tar v$(PKG_VERSION) > $(SRCDIR).tar - $(Q)$(TAR) --transform "s,^,$(SRCDIR)/," -rf $(SRCDIR).tar \ - $(SRCTARINC) - $(Q)$(ZIP) $(SRCDIR).tar +$(SRCTAR) : default $(SRCTARINC) .gitcensus + $(Q)$(TAR) --transform "s,^,$(SRCDIR)/," -zcf $(SRCDIR).tar.gz \ + `cat .gitcensus` $(SRCTARINC) echo Wrote: $@ + +.gitcensus: $(_FORCE) + $(Q) if test -d .git; then \ + git ls-files > .gitcensus && echo "new .gitcensus"; \ + fi diff --git a/include/buildrules b/include/buildrules index 4d55d01f..215fd426 100644 --- a/include/buildrules +++ b/include/buildrules @@ -23,17 +23,6 @@ $(SUBDIRS): $(Q)$(MAKE) $(MAKEOPTS) -q -C $@ || $(MAKE) $(MAKEOPTS) -C $@ endif -source-link: - @test -z "$$DIR" && DIR="."; \ - for f in `echo $(SRCFILES) $(SUBDIRS) $(POTHEAD)`; do \ - if test -d $$f ; then \ - mkdir $(TOPDIR)/$(PKG_NAME)-$(PKG_VERSION)/$$DIR/$$f || exit $$?; \ - $(MAKEF) DIR=$$DIR/$$f -C $$f $@ || exit $$?; \ - else \ - ln $$f $(TOPDIR)/$(PKG_NAME)-$(PKG_VERSION)/$$DIR/$$f || exit $$?; \ - fi; \ - done - # # Standard targets # |