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