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 /rescue | |
| 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 'rescue')
| -rw-r--r-- | rescue/Makefile | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/rescue/Makefile b/rescue/Makefile index e9b620dda..ef01f15de 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -13,30 +13,11 @@ install: $(RESCUE) $(RESCUE): list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img -dist-svn: - rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION) - mkdir -p $(PRODUCT)-$(VERSION)/tools - svn export -q -rBASE . $(PRODUCT)-$(VERSION)/rescue - cp ../Makefile.config $(PRODUCT)-$(VERSION)/ - cp ../tools/install-xml-file-list $(PRODUCT)-$(VERSION)/tools - tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION) - rm -rf $(PRODUCT)-$(VERSION) - -dist-git: - @cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD rescue tools/install-xml-file-list Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz; - dist: tar 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; + @cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD rescue tools/install-xml-file-list Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz; $(info $(PRODUCT)-$(VERSION).tar.xz is ready) clean: |