Subversion Repositories HelenOS

Rev

Rev 3349 | Rev 3438 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 3349 Rev 3410
Line 38... Line 38...
38 
endif
 38 
endif
39 
ifeq ($(RDFMT),fat)
 39 
ifeq ($(RDFMT),fat)
40 
	INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
 40 
	INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat
41 
endif
 41 
endif
42 
 
 42 
 
43 
RD_TASKS = \
 43 
RD_SRVS = \
44 
	$(USPACEDIR)/srv/pci/pci \
 44 
	$(USPACEDIR)/srv/pci/pci \
45 
	$(USPACEDIR)/srv/fb/fb \
 45 
	$(USPACEDIR)/srv/fb/fb \
46 
	$(USPACEDIR)/srv/kbd/kbd \
 46 
	$(USPACEDIR)/srv/kbd/kbd \
47 
	$(USPACEDIR)/srv/console/console \
 47 
	$(USPACEDIR)/srv/console/console \
48 
	$(USPACEDIR)/srv/fs/fat/fat \
 48 
	$(USPACEDIR)/srv/fs/fat/fat
- 
 
 49 
 
- 
 
 50 
RD_APPS = \
49 
	$(USPACEDIR)/app/tetris/tetris \
 51 
	$(USPACEDIR)/app/tetris/tetris \
50 
	$(USPACEDIR)/app/tester/tester \
 52 
	$(USPACEDIR)/app/tester/tester \
51 
	$(USPACEDIR)/app/klog/klog \
 53 
	$(USPACEDIR)/app/klog/klog \
52 
	$(USPACEDIR)/app/bdsh/bdsh
 54 
	$(USPACEDIR)/app/bdsh/bdsh
53 
 
 55 
 
54 
build: $(BASE)/image.iso
 56 
build: $(BASE)/image.iso
55 
 
 57 
 
56 
$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)
 58 
$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
57 
	mkdir -p arch/$(ARCH)/iso/boot/grub
 59 
	mkdir -p arch/$(ARCH)/iso/boot/grub
58 
	cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
 60 
	cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
59 
ifneq ($(RDFMT),tmpfs)
 61 
ifneq ($(RDFMT),tmpfs)
60 
	cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
 62 
	cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst
61 
endif
 63 
endif
Line 64... Line 66...
64 
endif
 66 
endif
65 
	cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
 67 
	cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
66 
	for task in $(INIT_TASKS) ; do \
 68 
	for task in $(INIT_TASKS) ; do \
67 
		cp $$task arch/$(ARCH)/iso/boot/ ; \
 69 
		cp $$task arch/$(ARCH)/iso/boot/ ; \
68 
	done
 70 
	done
- 
 
 71 
	for file in $(RD_SRVS) ; do \
- 
 
 72 
		cp $$file $(USPACEDIR)/dist/srv/ ; \
- 
 
 73 
	done
69 
	for task in $(RD_TASKS) ; do \
 74 
	for file in $(RD_APPS) ; do \
70 
		cp $$task $(USPACEDIR)/dist/sbin/ ; \
 75 
		cp $$file $(USPACEDIR)/dist/app/ ; \
71 
	done
 76 
	done
72 
ifeq ($(RDFMT),tmpfs)
 77 
ifeq ($(RDFMT),tmpfs)
73 
	$(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
 78 
	$(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs
74 
endif
 79 
endif
75 
ifeq ($(RDFMT),fat)
 80 
ifeq ($(RDFMT),fat)
Line 78... Line 83...
78 
	$(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
 83 
	$(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img
79 
	rm arch/$(ARCH)/iso/boot/initrd.fs
 84 
	rm arch/$(ARCH)/iso/boot/initrd.fs
80 
	mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
 85 
	mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(ARCH)/iso/
81 
 
 86 
 
82 
clean:
 87 
clean:
- 
 
 88 
	-for file in $(RD_SRVS) ; do \
- 
 
 89 
		rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
- 
 
 90 
	done
83 
	-for task in $(RD_TASKS) ; do \
 91 
	-for file in $(RD_APPS) ; do \
84 
		rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
 92 
		rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
85 
	done
 93 
	done
86 
	-rm -fr arch/$(ARCH)/iso
 94 
	-rm -fr arch/$(ARCH)/iso
87 
	-rm -f $(BASE)/image.iso
 95 
	-rm -f $(BASE)/image.iso