summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-09-04 19:52:57 +0100
committerColin Guthrie <colin@mageia.org>2013-09-04 19:59:04 +0100
commitb7c974efeded487957f7731633cfded9c633f556 (patch)
tree31c20ebfe31318fc35d341017b7f081a1b6b051a /images
parent73c9d1728a257cf1886db6377d5dbda835e8fb2d (diff)
downloaddrakx-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 'images')
-rw-r--r--images/Makefile20
1 files changed, 1 insertions, 19 deletions
diff --git a/images/Makefile b/images/Makefile
index 454b46cc6..01bbc23f3 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -22,26 +22,8 @@ all.kernels: update_kernel ../kernel/list_modules.pm
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;
- $(info $(PRODUCT)-$(VERSION).tar.xz is ready)
-
-dist-svn:
- mkdir -p $(PRODUCT)-$(VERSION)
- svn export -q -rBASE . $(PRODUCT)-$(VERSION)/images
- 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 images kernel Makefile.config | xz >images/$(PRODUCT)-$(VERSION).tar.xz;
+ $(info $(PRODUCT)-$(VERSION).tar.xz is ready)
clean:
rm -rf images isolinux all.kernels modules.description