Rev 3992 | Rev 4155 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3992 | Rev 4153 | ||
|---|---|---|---|
| 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 \ |
| - | 53 | $(USPACEDIR)/app/trace/trace \ |
|
| 51 | $(USPACEDIR)/app/klog/klog \ |
54 | $(USPACEDIR)/app/klog/klog \ |
| 52 | $(USPACEDIR)/app/bdsh/bdsh \ |
55 | $(USPACEDIR)/app/bdsh/bdsh \ |
| 53 | $(USPACEDIR)/srv/net/networking/networking \ |
56 | $(USPACEDIR)/srv/net/networking/networking \ |
| 54 | $(USPACEDIR)/srv/net/networking/startup/networking_startup \ |
57 | $(USPACEDIR)/srv/net/networking/startup/networking_startup \ |
| 55 | $(USPACEDIR)/srv/net/netif/lo/lo |
58 | $(USPACEDIR)/srv/net/netif/lo/lo \ |
| 56 | # $(USPACEDIR)/srv/net/netif/dp8390_isa |
59 | $(USPACEDIR)/srv/net/netif/dp8390/dp8390 |
| 57 | 60 | ||
| 58 | ifeq ($(NETWORKING), modular) |
61 | ifeq ($(NETWORKING), modular) |
| 59 | RD_TASKS += $(USPACEDIR)/srv/net/il/ip/ip \ |
62 | RD_TASKS += $(USPACEDIR)/srv/net/il/ip/ip \ |
| 60 | $(USPACEDIR)/srv/net/tl/tcp/tcp \ |
63 | $(USPACEDIR)/srv/net/tl/tcp/tcp \ |
| 61 | $(USPACEDIR)/srv/net/il/arp/arp \ |
64 | $(USPACEDIR)/srv/net/il/arp/arp \ |
| Line 66... | Line 69... | ||
| 66 | # $(USPACEDIR)/srv/net/socket |
69 | # $(USPACEDIR)/srv/net/socket |
| 67 | endif |
70 | endif |
| 68 | 71 | ||
| 69 | build: $(BASE)/image.iso |
72 | build: $(BASE)/image.iso |
| 70 | 73 | ||
| 71 | $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) |
74 | $(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) |
| 72 | mkdir -p arch/$(ARCH)/iso/boot/grub |
75 | mkdir -p arch/$(BARCH)/iso/boot/grub |
| 73 | cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
76 | cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/ |
| 74 | ifneq ($(RDFMT),tmpfs) |
77 | ifneq ($(RDFMT),tmpfs) |
| 75 | cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst |
78 | cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst |
| 76 | endif |
79 | endif |
| 77 | ifneq ($(RDFMT),fat) |
80 | ifneq ($(RDFMT),fat) |
| 78 | cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst |
81 | cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst |
| 79 | endif |
82 | endif |
| 80 | cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
83 | cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/ |
| 81 | for task in $(INIT_TASKS) ; do \ |
84 | for task in $(INIT_TASKS) ; do \ |
| 82 | cp $$task arch/$(ARCH)/iso/boot/ ; \ |
85 | cp $$task arch/$(BARCH)/iso/boot/ ; \ |
| - | 86 | done |
|
| - | 87 | for file in $(RD_SRVS) ; do \ |
|
| - | 88 | cp $$file $(USPACEDIR)/dist/srv/ ; \ |
|
| 83 | done |
89 | done |
| 84 | for task in $(RD_TASKS) ; do \ |
90 | for file in $(RD_APPS) ; do \ |
| 85 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
91 | cp $$file $(USPACEDIR)/dist/app/ ; \ |
| 86 | done |
92 | done |
| 87 | ifeq ($(RDFMT),tmpfs) |
93 | ifeq ($(RDFMT),tmpfs) |
| 88 | $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
94 | $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs |
| 89 | endif |
95 | endif |
| 90 | ifeq ($(RDFMT),fat) |
96 | ifeq ($(RDFMT),fat) |
| 91 | $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
97 | $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs |
| 92 | endif |
98 | endif |
| 93 | $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img |
99 | $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img |
| 94 | rm arch/$(ARCH)/iso/boot/initrd.fs |
100 | rm arch/$(BARCH)/iso/boot/initrd.fs |
| 95 | 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/ |
101 | mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $(BASE)/image.iso arch/$(BARCH)/iso/ |
| 96 | 102 | ||
| 97 | clean: |
103 | clean: |
| - | 104 | -for file in $(RD_SRVS) ; do \ |
|
| - | 105 | rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ |
|
| - | 106 | done |
|
| 98 | -for task in $(RD_TASKS) ; do \ |
107 | -for file in $(RD_APPS) ; do \ |
| 99 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |
108 | rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ |
| 100 | done |
109 | done |
| 101 | -rm -fr arch/$(ARCH)/iso |
110 | -rm -fr arch/$(BARCH)/iso |
| 102 | -rm -f $(BASE)/image.iso |
111 | -rm -f $(BASE)/image.iso |