diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-09-04 19:52:57 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-09-04 19:59:04 +0100 |
| commit | b7c974efeded487957f7731633cfded9c633f556 (patch) | |
| tree | 31c20ebfe31318fc35d341017b7f081a1b6b051a /perl-install/Makefile | |
| parent | 73c9d1728a257cf1886db6377d5dbda835e8fb2d (diff) | |
| download | drakx-b7c974efeded487957f7731633cfded9c633f556.tar drakx-b7c974efeded487957f7731633cfded9c633f556.tar.gz drakx-b7c974efeded487957f7731633cfded9c633f556.tar.bz2 drakx-b7c974efeded487957f7731633cfded9c633f556.tar.xz drakx-b7c974efeded487957f7731633cfded9c633f556.zip | |
Remove svn support from Makefiles
This should leave us with a working tarballs in all cases.
The perl-install/Makefile has been adjusted to do the same as the previous
svn rules (regarding copying Makefiles and running a perl tidyup routine)
The perl-install/install/Makefile has been adjusted to svn export the
rpm srate info from meta-task package subversion. This requires an active
network connection, but should result in the same tarball as before
until this is factored out
Diffstat (limited to 'perl-install/Makefile')
| -rw-r--r-- | perl-install/Makefile | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index f83ceaadb..55871dbe0 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -53,33 +53,18 @@ install_pms stage2 full_stage2: mo_files : $(MOFILES) # rules to build tarball -dist-svn: +dist: tar + +tar: clean + rm -rf $(PACKAGE)*.tar* $(PACKAGE)-$(PKGVERSION) mkdir -p $(PACKAGE)-$(PKGVERSION)/tools - svn export -q -rBASE . $(PACKAGE)-$(PKGVERSION)/perl-install - for i in $(OTHERS); do svn export -q ../$$i $(PACKAGE)-$(PKGVERSION)/$$i; done + (cd ..; git archive HEAD perl-install/{[^i]*,int*} $(OTHERS) kernel/list_modules.pm Makefile.config) | tar xC $(PACKAGE)-$(PKGVERSION) rm -rf $(PACKAGE)-$(PKGVERSION)/perl-install/{install,unused,list_modules.pm} cp -f ../kernel/list_modules.pm $(PACKAGE)-$(PKGVERSION)/perl-install cd $(PACKAGE)-$(PKGVERSION)/perl-install ; mv -f Makefile.drakxtools Makefile @make nuke_perl tar cfa $(PACKAGE)-$(PKGVERSION).tar.xz $(PACKAGE)-$(PKGVERSION) rm -rf $(PACKAGE)-$(PKGVERSION) - -dist-git: - @cd ..; git archive --prefix=$(PACKAGE)-$(PKGVERSION)/ HEAD perl-install/{[^i]*,int*} $(OTHERS) kernel/list_modules.pm Makefile.config | xz >$(PACKAGE)-$(PKGVERSION).tar.xz; - @echo "WARNING: this archive is not complete !!! Regenerate it from SVN" - -dist: tar - -tar: clean - rm -rf $(PACKAGE)*.tar* $(PACKAGE)-$(PKGVERSION) - @if [ -e "../../.svn" ]; then \ - $(MAKE) dist-svn; \ - elif [ -e "../.git" ]; then \ - $(MAKE) dist-git; \ - else \ - echo "Unknown SCM (not SVN nor GIT)";\ - exit 1; \ - fi; $(info $(PACKAGE)-$(PKGVERSION).tar.xz is ready) # rules to build a distributable rpm |