diff options
| author | Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com> | 2013-12-21 13:37:33 +0100 |
|---|---|---|
| committer | Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com> | 2013-12-21 13:37:33 +0100 |
| commit | 095c6b25885ce3d22eedba8cdb98f1fd7e8708a5 (patch) | |
| tree | 5bfc768996b3ddec185abeb02b602b48b14d10db /images/Makefile | |
| parent | df60191bdbddfa7c8e5bd11a2578aae6740963c0 (diff) | |
| parent | f76dc0931e47338aa9c7db257d28e5015d8a2f47 (diff) | |
| download | drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.gz drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.bz2 drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.tar.xz drakx-095c6b25885ce3d22eedba8cdb98f1fd7e8708a5.zip | |
Merge branch 'master' of git://git.mageia.org/software/drakx
Diffstat (limited to 'images/Makefile')
| -rw-r--r-- | images/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/images/Makefile b/images/Makefile index 18956e2cf..142cfd577 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=1.93 +VERSION=2.4 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/3.*) @@ -8,7 +8,12 @@ IMAGES_DEST = $(ROOTDEST)/install/images all: images -images: all.kernels +boot.iso: images/boot.iso + +images/boot.iso: all.kernels/.list make_boot_img + DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img images/boot.iso + +images: all.kernels/.list DISTRIB_DESCR=$(DISTRIB_DESCR) DISTRIB_VERSION=$(DISTRIB_VERSION) ./make_boot_img rm -rf images/alternatives if [ `ls images/*.img-* 2>/dev/null | wc -l` -gt 0 ]; then \ @@ -16,7 +21,7 @@ images: all.kernels fi cd images ; md5sum *.{img,iso}* > MD5SUM -all.kernels: update_kernel ../kernel/list_modules.pm +all.kernels/.list: update_kernel ./update_kernel $(KERNELS) dist: tar @@ -26,7 +31,7 @@ tar: $(info $(PRODUCT)-$(VERSION).tar.xz is ready) clean: - rm -rf images isolinux all.kernels modules.description + rm -rf images isolinux all.kernels modules.description build find . -name "*~" -o -name ".#*" | xargs rm -f install: @@ -37,3 +42,5 @@ install: rm -rf $(ROOTDEST)/isolinux cp -af isolinux $(ROOTDEST) endif + +.PHONY: boot.iso install clean dist tar images |