Rev 3403 | Rev 3535 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3403 | Rev 3448 | ||
---|---|---|---|
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/dltest/dltest \ |
53 | $(USPACEDIR)/app/dltest/dltest \ |
- | 54 | $(USPACEDIR)/app/trace/trace \ |
|
52 | $(USPACEDIR)/app/klog/klog \ |
55 | $(USPACEDIR)/app/klog/klog \ |
53 | $(USPACEDIR)/app/bdsh/bdsh |
56 | $(USPACEDIR)/app/bdsh/bdsh |
54 | 57 | ||
55 | RD_LIBS = \ |
58 | RD_LIBS = \ |
56 | $(USPACEDIR)/lib/rtld/rtld.so \ |
59 | $(USPACEDIR)/lib/rtld/rtld.so \ |
57 | $(USPACEDIR)/lib/libc-shared/libc.so.0 |
60 | $(USPACEDIR)/lib/libc-shared/libc.so.0 |
58 | 61 | ||
59 | build: $(BASE)/image.iso |
62 | build: $(BASE)/image.iso |
60 | 63 | ||
61 | $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) $(RD_LIBS) |
64 | $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS) |
62 | mkdir -p arch/$(ARCH)/iso/boot/grub |
65 | mkdir -p arch/$(ARCH)/iso/boot/grub |
63 | cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
66 | cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
64 | ifneq ($(RDFMT),tmpfs) |
67 | ifneq ($(RDFMT),tmpfs) |
65 | cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst |
68 | cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst |
66 | endif |
69 | endif |
Line 69... | Line 72... | ||
69 | endif |
72 | endif |
70 | cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
73 | cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
71 | for task in $(INIT_TASKS) ; do \ |
74 | for task in $(INIT_TASKS) ; do \ |
72 | cp $$task arch/$(ARCH)/iso/boot/ ; \ |
75 | cp $$task arch/$(ARCH)/iso/boot/ ; \ |
73 | done |
76 | done |
74 | for task in $(RD_TASKS) ; do \ |
77 | for file in $(RD_SRVS) ; do \ |
75 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
78 | cp $$file $(USPACEDIR)/dist/srv/ ; \ |
76 | done |
79 | done |
77 | for lib in $(RD_LIBS) ; do \ |
80 | for lib in $(RD_LIBS) ; do \ |
78 | cp $$lib $(USPACEDIR)/dist/lib/ ; \ |
81 | cp $$lib $(USPACEDIR)/dist/lib/ ; \ |
79 | done |
82 | done |
- | 83 | for file in $(RD_APPS) ; do \ |
|
- | 84 | cp $$file $(USPACEDIR)/dist/app/ ; \ |
|
- | 85 | done |
|
80 | ifeq ($(RDFMT),tmpfs) |
86 | ifeq ($(RDFMT),tmpfs) |
81 | $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
87 | $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
82 | endif |
88 | endif |
83 | ifeq ($(RDFMT),fat) |
89 | ifeq ($(RDFMT),fat) |
84 | $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
90 | $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
Line 86... | Line 92... | ||
86 | $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img |
92 | $(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 |
93 | rm arch/$(ARCH)/iso/boot/initrd.fs |
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/ |
94 | 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/ |
89 | 95 | ||
90 | clean: |
96 | clean: |
91 | -for task in $(RD_TASKS) ; do \ |
97 | -for file in $(RD_SRVS) ; do \ |
92 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |
98 | rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ |
93 | done |
99 | done |
94 | -for lib in $(RD_LIBS) ; do \ |
100 | -for lib in $(RD_LIBS) ; do \ |
95 | rm -f $(USPACEDIR)/dist/lib/`basename $$lib` ; \ |
101 | rm -f $(USPACEDIR)/dist/lib/`basename $$lib` ; \ |
96 | done |
102 | done |
- | 103 | -for file in $(RD_APPS) ; do \ |
|
- | 104 | rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ |
|
- | 105 | done |
|
97 | -rm -fr arch/$(ARCH)/iso |
106 | -rm -fr arch/$(ARCH)/iso |
98 | -rm -f $(BASE)/image.iso |
107 | -rm -f $(BASE)/image.iso |