diff options
| author | ennael <ennael@mageia.org> | 2013-09-04 21:14:20 +0200 |
|---|---|---|
| committer | ennael <ennael@mageia.org> | 2013-09-04 21:14:20 +0200 |
| commit | 91701094ea146f08753c91c040973ecd1cf2bc3e (patch) | |
| tree | 86374188cc012767bfbeb5df5895990db348ad41 /images | |
| parent | 90a211849bad01493dce7875c901205a41023486 (diff) | |
| parent | b7c974efeded487957f7731633cfded9c633f556 (diff) | |
| download | drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar.gz drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar.bz2 drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.tar.xz drakx-91701094ea146f08753c91c040973ecd1cf2bc3e.zip | |
Merge branch 'master' of git://git.mageia.org/software/drakx
Diffstat (limited to 'images')
| -rw-r--r-- | images/Makefile | 20 |
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 |