| 32,8 → 32,13 |
|---|
| $(USPACEDIR)/app/init/init \ |
| $(USPACEDIR)/srv/devmap/devmap \ |
| $(USPACEDIR)/srv/rd/rd \ |
| $(USPACEDIR)/srv/vfs/vfs \ |
| $(USPACEDIR)/srv/fs/tmpfs/tmpfs |
| $(USPACEDIR)/srv/vfs/vfs |
| ifeq ($(RDFMT),tmpfs) |
| INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs |
| endif |
| ifeq ($(RDFMT),fat) |
| INIT_TASKS += $(USPACEDIR)/srv/fs/fat/fat |
| endif |
| |
| RD_TASKS = \ |
| $(USPACEDIR)/srv/pci/pci \ |
| 43,9 → 48,9 |
|---|
| $(USPACEDIR)/srv/fs/fat/fat \ |
| $(USPACEDIR)/app/tetris/tetris \ |
| $(USPACEDIR)/app/tester/tester \ |
| $(USPACEDIR)/app/cli/cli \ |
| $(USPACEDIR)/app/dltest/dltest \ |
| $(USPACEDIR)/app/klog/klog |
| $(USPACEDIR)/app/klog/klog \ |
| $(USPACEDIR)/app/bdsh/bdsh |
| |
| RD_LIBS = \ |
| $(USPACEDIR)/lib/rtld/rtld.so \ |
| 56,7 → 61,12 |
|---|
| $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS) $(RD_LIBS) |
| mkdir -p arch/$(ARCH)/iso/boot/grub |
| cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/ |
| cp arch/$(ARCH)/grub/menu.lst arch/$(ARCH)/iso/boot/grub/ |
| ifneq ($(RDFMT),tmpfs) |
| cat arch/$(ARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(ARCH)/iso/boot/grub/menu.lst |
| endif |
| ifneq ($(RDFMT),fat) |
| cat arch/$(ARCH)/grub/menu.lst | grep -v "fat" >arch/$(ARCH)/iso/boot/grub/menu.lst |
| endif |
| cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/ |
| for task in $(INIT_TASKS) ; do \ |
| cp $$task arch/$(ARCH)/iso/boot/ ; \ |
| 64,10 → 74,17 |
|---|
| for task in $(RD_TASKS) ; do \ |
| cp $$task $(USPACEDIR)/dist/sbin/ ; \ |
| done |
| for task in $(RD_LIBS) ; do \ |
| cp $$task $(USPACEDIR)/dist/lib/ ; \ |
| for lib in $(RD_LIBS) ; do \ |
| cp $$lib $(USPACEDIR)/dist/lib/ ; \ |
| done |
| $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img |
| ifeq ($(RDFMT),tmpfs) |
| $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
| endif |
| ifeq ($(RDFMT),fat) |
| $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs |
| endif |
| $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs arch/$(ARCH)/iso/boot/initrd.img |
| rm arch/$(ARCH)/iso/boot/initrd.fs |
| 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/ |
| |
| clean: |