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/install | |
| 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/install')
| -rw-r--r-- | perl-install/install/Makefile | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile index f3a63da8f..cfbd6444a 100644 --- a/perl-install/install/Makefile +++ b/perl-install/install/Makefile @@ -15,29 +15,13 @@ all: xs clean xs: make -C .. $@ -dist-svn: - mkdir -p $(PRODUCT)-$(VERSION) - svn export -q -rBASE .. $(PRODUCT)-$(VERSION)/perl-install - svn export -q -rBASE ../../tools $(PRODUCT)-$(VERSION)/tools - svn export -q -rBASE ../../kernel $(PRODUCT)-$(VERSION)/kernel - cp ../../Makefile.config $(PRODUCT)-$(VERSION)/ - tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION) - rm -rf $(PRODUCT)-$(VERSION) - -dist-git: - @cd ../..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD kernel perl-install tools Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz; - @echo WARNING: rpmsrate is MISSING!!! - tar: rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION) - @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; + mkdir -p $(PRODUCT)-$(VERSION)/perl-install/install/share/ + (cd ../..; git archive HEAD kernel perl-install tools Makefile.config) | tar xC $(PRODUCT)-$(VERSION) + svn export svn://svn.mageia.org/svn/packages/cauldron/meta-task/current/SOURCES $(PRODUCT)-$(VERSION)/perl-install/install/share/meta-task + tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION) + rm -rf $(PRODUCT)-$(VERSION) $(info $(PRODUCT)-$(VERSION).tar.xz is ready) install: |