Rev 3400 | Rev 3448 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3400 | Rev 3403 | ||
---|---|---|---|
Line 30... | Line 30... | ||
30 | $(USPACEDIR)/srv/ns/ns \ |
30 | $(USPACEDIR)/srv/ns/ns \ |
31 | $(USPACEDIR)/srv/loader/loader \ |
31 | $(USPACEDIR)/srv/loader/loader \ |
32 | $(USPACEDIR)/app/init/init \ |
32 | $(USPACEDIR)/app/init/init \ |
33 | $(USPACEDIR)/srv/devmap/devmap \ |
33 | $(USPACEDIR)/srv/devmap/devmap \ |
34 | $(USPACEDIR)/srv/rd/rd \ |
34 | $(USPACEDIR)/srv/rd/rd \ |
35 | $(USPACEDIR)/srv/vfs/vfs \ |
35 | $(USPACEDIR)/srv/vfs/vfs |
- | 36 | ifeq ($(RDFMT),tmpfs) |
|
36 | $(USPACEDIR)/srv/fs/tmpfs/tmpfs |
37 | INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs |
- | 38 | endif |
|
- | 39 | ifeq ($(RDFMT),fat) |
|
- | 40 | INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat |
|
- | 41 | endif |
|
37 | 42 | ||
38 | RD_TASKS = \ |
43 | RD_TASKS = \ |
39 | $(USPACEDIR)/srv/pci/pci \ |
44 | $(USPACEDIR)/srv/pci/pci \ |
40 | $(USPACEDIR)/srv/fb/fb \ |
45 | $(USPACEDIR)/srv/fb/fb \ |
41 | $(USPACEDIR)/srv/kbd/kbd \ |
46 | $(USPACEDIR)/srv/kbd/kbd \ |
42 | $(USPACEDIR)/srv/console/console \ |
47 | $(USPACEDIR)/srv/console/console \ |
43 | $(USPACEDIR)/srv/fs/fat/fat \ |
48 | $(USPACEDIR)/srv/fs/fat/fat \ |
44 | $(USPACEDIR)/app/tetris/tetris \ |
49 | $(USPACEDIR)/app/tetris/tetris \ |
45 | $(USPACEDIR)/app/tester/tester \ |
50 | $(USPACEDIR)/app/tester/tester \ |
46 | $(USPACEDIR)/app/cli/cli \ |
- | |
47 | $(USPACEDIR)/app/dltest/dltest \ |
51 | $(USPACEDIR)/app/dltest/dltest \ |
48 | $(USPACEDIR)/app/klog/klog |
52 | $(USPACEDIR)/app/klog/klog \ |
- | 53 | $(USPACEDIR)/app/bdsh/bdsh |
|
49 | 54 | ||
50 | RD_LIBS = \ |
55 | RD_LIBS = \ |
51 | $(USPACEDIR)/lib/rtld/rtld.so \ |
56 | $(USPACEDIR)/lib/rtld/rtld.so \ |
52 | $(USPACEDIR)/lib/libc-shared/libc.so.0 |
57 | $(USPACEDIR)/lib/libc-shared/libc.so.0 |
53 | 58 | ||
54 | build: $(BASE)/image.iso |
59 | build: $(BASE)/image.iso |
55 | 60 | ||
56 | $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) $(RD_LIBS) |
61 | $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) $(RD_LIBS) |
57 | mkdir -p arch/$(ARCH)/iso/boot/grub |
62 | mkdir -p arch/$(ARCH)/iso/boot/grub |
58 | cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
63 | cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
- | 64 | ifneq ($(RDFMT),tmpfs) |
|
- | 65 | cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst |
|
- | 66 | endif |
|
- | 67 | ifneq ($(RDFMT),fat) |
|
59 | cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ |
68 | cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst |
- | 69 | endif |
|
60 | cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
70 | cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
61 | for task in $(INIT_TASKS) ; do \ |
71 | for task in $(INIT_TASKS) ; do \ |
62 | cp $$task arch/$(ARCH)/iso/boot/ ; \ |
72 | cp $$task arch/$(ARCH)/iso/boot/ ; \ |
63 | done |
73 | done |
64 | for task in $(RD_TASKS) ; do \ |
74 | for task in $(RD_TASKS) ; do \ |
65 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
75 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
66 | done |
76 | done |
67 | for task in $(RD_LIBS) ; do \ |
77 | for lib in $(RD_LIBS) ; do \ |
68 | cp $$task $(USPACEDIR)/dist/lib/ ; \ |
78 | cp $$lib $(USPACEDIR)/dist/lib/ ; \ |
69 | done |
79 | done |
- | 80 | ifeq ($(RDFMT),tmpfs) |
|
70 | $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img |
81 | $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
- | 82 | endif |
|
- | 83 | ifeq ($(RDFMT),fat) |
|
- | 84 | $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
|
- | 85 | endif |
|
- | 86 | $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img |
|
- | 87 | rm arch/$(ARCH)/iso/boot/initrd.fs |
|
71 | 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/ |
88 | 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/ |
72 | 89 | ||
73 | clean: |
90 | clean: |
74 | -for task in $(RD_TASKS) ; do \ |
91 | -for task in $(RD_TASKS) ; do \ |
75 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |
92 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |