Rev 3243 | Rev 3258 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3243 | Rev 3244 | ||
|---|---|---|---|
| Line 46... | Line 46... | ||
| 46 | $(USPACEDIR)/srv/kbd/kbd \ |
46 | $(USPACEDIR)/srv/kbd/kbd \ |
| 47 | $(USPACEDIR)/srv/console/console \ |
47 | $(USPACEDIR)/srv/console/console \ |
| 48 | $(USPACEDIR)/app/tetris/tetris \ |
48 | $(USPACEDIR)/app/tetris/tetris \ |
| 49 | $(USPACEDIR)/app/tester/tester \ |
49 | $(USPACEDIR)/app/tester/tester \ |
| 50 | $(USPACEDIR)/app/klog/klog \ |
50 | $(USPACEDIR)/app/klog/klog \ |
| 51 | $(USPACEDIR)/app/cli/cli |
51 | $(USPACEDIR)/app/cli/cli \ |
| 52 | ifneq ($(RDFMT),tmpfs) |
- | |
| 53 | RD_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs |
52 | $(USPACEDIR)/srv/fs/tmpfs/tmpfs \ |
| 54 | endif |
- | |
| 55 | ifneq ($(RDFMT),fat) |
- | |
| 56 | RD_TASKS += $(USPACEDIR)/srv/fs/fat/fat |
53 | $(USPACEDIR)/srv/fs/fat/fat |
| 57 | endif |
- | |
| 58 | 54 | ||
| 59 | build: $(BASE)/image.iso |
55 | build: $(BASE)/image.iso |
| 60 | 56 | ||
| 61 | $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) |
57 | $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) |
| 62 | mkdir -p arch/$(ARCH)/iso/boot/grub |
58 | mkdir -p arch/$(ARCH)/iso/boot/grub |
| Line 73... | Line 69... | ||
| 73 | done |
69 | done |
| 74 | for task in $(RD_TASKS) ; do \ |
70 | for task in $(RD_TASKS) ; do \ |
| 75 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
71 | cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
| 76 | done |
72 | done |
| 77 | ifeq ($(RDFMT),tmpfs) |
73 | ifeq ($(RDFMT),tmpfs) |
| 78 | $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img |
74 | $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs.img |
| 79 | endif |
75 | endif |
| 80 | ifeq ($(RDFMT),fat) |
76 | ifeq ($(RDFMT),fat) |
| 81 | $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img |
77 | $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs.img |
| 82 | endif |
78 | endif |
| - | 79 | $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs.img arch/$(ARCH)/iso/boot/initrd.img |
|
| - | 80 | rm arch/$(ARCH)/iso/boot/initrd.fs.img |
|
| 83 | 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 | 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/ |
| 84 | 82 | ||
| 85 | clean: |
83 | clean: |
| 86 | -for task in $(RD_TASKS) ; do \ |
84 | -for task in $(RD_TASKS) ; do \ |
| 87 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |
85 | rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \ |