diff options
Diffstat (limited to 'move/Makefile')
| -rw-r--r-- | move/Makefile | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/move/Makefile b/move/Makefile index 67aa7932a..87dbcb5d9 100644 --- a/move/Makefile +++ b/move/Makefile @@ -1,6 +1,6 @@ -DEST = /BIG/move -DEST_LIVETREE = $(DEST)/live_tree -DEST_STAGE2 = $(DEST_LIVETREE)/usr/lib/stage2 + +DEST_LIVETREE = /tmp/live_tree +DEST_STAGE2 = $(DEST_LIVETREE)/usr/bin/stage2 ISO = /BIG/mdkmove.iso @@ -24,21 +24,19 @@ endif .PHONY: iso -default: install - -get_dest_livetree: - @echo -n $(DEST_LIVETREE) +all: install -build: stage1 xwait runlevel_set +build: xwait runlevel_set isolinux/boot.msg + cd $(STAGE1) && ADDITIONAL_DEFS="-DMANDRAKE_MOVE" MOVE=1 make init stage1-full init-move sudo ./collect-directories-to-create.pl $(DEST_LIVETREE) > data/directories-to-create sudo find $(DEST_LIVETREE)/etc -type f | perl -pe 's|$(DEST_LIVETREE)||' > data/all-etcfiles $(MAKE) -C ../perl-install mo_files -stage1: - cd $(STAGE1) && ADDITIONAL_DEFS="-DMANDRAKE_MOVE" MOVE=1 make dirs init stage1-full init-move - cd .. ; ./make_boot_img move +isolinux/boot.msg: data/isolinux-graphic.bmp + lilo-bmp2mdk mode:0x103 progress:371,144,4,4,64+11 clear:600,800,64+127 pos:0,0 < $< > $@ -install: +install: build + #- todo: make_boot_img alike to create boot volume from ../mdk-stage1/stage1-cdrom (isolinux mandatory since stock kernel is so big) sudo cp -f $(STAGE1)/init-move $(DEST_LIVETREE)/sbin/init $(MAKE) -C ../perl-install/share/po install NAME=libDrakX DATADIR=$(DEST_LIVETREE)/usr/share @@ -59,10 +57,10 @@ install: sudo rm -rf $(DEST_LIVETREE)/usr/share/langs sudo mkdir -p $(DEST_LIVETREE)/usr/share/langs - sudo cp -f $(INSTALL)/pixmaps/langs/lang-*.png $(DEST_LIVETREE)/usr/share/langs + sudo cp -f $(patsubst %, $(INSTALL)/pixmaps/langs/lang-%.png, $(LANG_FILES)) $(DEST_LIVETREE)/usr/share/langs #- overwrite /usr/lib/libDrakX files of the live tree with those in CVS - (cd $(DEST_LIVETREE)/usr/lib/libDrakX ; find -name "*.pm") | egrep -v 'ctxhelp|drakfirsttime|xfree3|xfree4|xfreeX' | (cd $(INSTALL) ; sudo cpio -pLumd $(DEST_LIVETREE)/usr/lib/libDrakX/) + (cd $(DEST_LIVETREE)/usr/lib/libDrakX ; find -name "*.pm") | egrep -v 'ctxhelp|drakfirsttime' | (cd $(INSTALL) ; sudo cpio -pLumd $(DEST_LIVETREE)/usr/lib/libDrakX/) #- overwrite stuff.so of drakxtools because it doesn't contain C_DRAKX stuff sudo cp -f ../perl-install/c/blib/arch/auto/stuff/stuff.so $(DEST_LIVETREE)/usr/lib/libDrakX/auto/c/stuff @@ -88,33 +86,33 @@ install: sudo cp -f /tmp/version $(DEST_LIVETREE)/usr/share/VERSION live_tree_boot: - rm -f $(DEST)/live_tree*.clp - ./make_live_tree_boot $(DEST_LIVETREE) + rm -f /tmp/live_tree*.clp + ./make_live_tree_boot tools/fix-fc-cache.pl $(DEST_LIVETREE) - $(MAKE) $(DEST)/live_tree_always.clp - $(MAKE) $(DEST)/live_tree_boot.clp - $(MAKE) $(DEST)/live_tree_totem.clp - -$(MAKE) $(DEST)/live_tree_nvidia.clp - $(MAKE) $(patsubst %, $(DEST)/live_tree_always_i18n_%.clp, $(LANG_FILES)) + $(MAKE) /tmp/live_tree_always.clp + $(MAKE) /tmp/live_tree_boot.clp + $(MAKE) /tmp/live_tree_totem.clp + -$(MAKE) /tmp/live_tree_nvidia.clp + $(MAKE) $(patsubst %, /tmp/live_tree_always_i18n_%.clp, $(LANG_FILES)) un_live_tree_boot: - ./make_live_tree_boot -u $(DEST_LIVETREE) + ./make_live_tree_boot -u tools/fix-fc-cache.pl $(DEST_LIVETREE) -iso: un_live_tree_boot build install live_tree_boot - rm -rf $(DEST)/iso $(DEST)/live_tree.clp - mkdir $(DEST)/iso - cp -a isolinux $(DEST)/iso - rm -rf $(DEST)/iso/isolinux/CVS - $(MAKE) $(DEST)/live_tree.clp - mv $(DEST)/*.clp $(DEST)/iso +iso: un_live_tree_boot install live_tree_boot + rm -rf /tmp/iso /tmp/live_tree.clp + mkdir /tmp/iso + cp -a isolinux /tmp/iso + rm -rf /tmp/iso/isolinux/CVS + $(MAKE) /tmp/live_tree.clp + mv /tmp/*.clp /tmp/iso - touch $(DEST)/iso/isolinux/boot.cat - find $(DEST)/iso/isolinux -type f -printf '%p 100\n' > $(DEST)/iso.sort ; echo '$(DEST)/iso/live_tree_boot.clp 5' >> $(DEST)/iso.sort + touch /tmp/iso/isolinux/boot.cat + find /tmp/iso/isolinux -type f -printf '%p 100\n' > /tmp/iso.sort ; echo '/tmp/iso/live_tree_boot.clp 5' >> /tmp/iso.sort # download version: MOVE10DO # complete version: MOVE10IN - mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -P MandrakeSoft -V 'MandrakeMove' -volset MOVE10IN -b isolinux/isolinux.bin -c isolinux/boot.cat -sort $(DEST)/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) $(DEST)/iso - mv $(DEST)/iso/*.clp $(DEST) + mkisofs -r -J -hide-rr-moved -nobak -cache-inodes -P MandrakeSoft -V 'MandrakeMove' -volset MOVE10IN -b isolinux/isolinux.bin -c isolinux/boot.cat -sort /tmp/iso.sort -no-emul-boot -boot-load-size 4 -boot-info-table -o $(ISO) /tmp/iso + mv /tmp/iso/*.clp /tmp mkcd --addmd5 $(ISO) # cdrecord -v -eject dev=0,0,0 blank=fast gracetime=2 speed=99 $(ISO) # ftp://a:a@leia//BIG/mdkmove.iso @@ -136,6 +134,6 @@ clean: fi check_dirs: - for i in `cat data/*.dirs`; do grep "^$$i/" data/*.list && echo "$$i"; done ||: + for i in `cat data/*.dirs`; do grep /tmp/live_tree$$i/ data/*.list; done ||: # perl tools/busy-files-accesses --no-link --no-dir --full-dirs 'data/always.dirs data/boot.dirs data/totem.dirs' --already-have data/always.list |