Changeset 00db5bcf in mainline for boot/arch/ia32

Timestamp:

2008-06-03T14:37:17Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

558c2bd

Parents:

1f0d2ee9

Message:

RAM disk / filesystem support

Location:

boot/arch/ia32

Files:

• Makefile.inc (modified) (2 diffs)
• grub/menu.lst (modified) (1 diff)

boot/arch/ia32/Makefile.inc

@@ -27 +27 @@
 #
 
-TASKS = \
+INIT_TASKS = \
         $(USPACEDIR)/srv/ns/ns \
+        $(USPACEDIR)/app/init/init \
+        $(USPACEDIR)/srv/devmap/devmap \
+        $(USPACEDIR)/srv/rd/rd \
+        $(USPACEDIR)/srv/vfs/vfs \
+        $(USPACEDIR)/srv/fs/tmpfs/tmpfs
+
+RD_TASKS = \
         $(USPACEDIR)/srv/pci/pci \
         $(USPACEDIR)/srv/fb/fb \
         $(USPACEDIR)/srv/kbd/kbd \
         $(USPACEDIR)/srv/console/console \
-        $(USPACEDIR)/srv/vfs/vfs \
-        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
         $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/devmap/devmap \
-        $(USPACEDIR)/app/init/init \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
@@ -44 +47 @@
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(TASKS)
+$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)
         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/
         cp $(KERNELDIR)/kernel.bin arch/$(ARCH)/iso/boot/
-        for task in $(TASKS) ; do \
+        for task in $(INIT_TASKS) ; do \
                 cp $$task arch/$(ARCH)/iso/boot/ ; \
         done
+        for task in $(RD_TASKS) ; do \
+                cp $$task $(USPACEDIR)/dist/sbin/ ; \
+        done
+        $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
         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:
+        -for task in $(RD_TASKS) ; do \
+                rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+        done
         -rm -fr arch/$(ARCH)/iso
         -rm -f $(BASE)/image.iso

boot/arch/ia32/grub/menu.lst

@@ -3 +3 @@
 
 title=HelenOS
-root (cd)
-kernel /boot/kernel.bin
-module /boot/ns
-module /boot/init
-module /boot/pci
-module /boot/fb
-module /boot/kbd
-module /boot/console
-module /boot/vfs
-module /boot/tmpfs
-module /boot/fat
-module /boot/devmap
-module /boot/tetris
-module /boot/tester
-module /boot/klog
+        root (cd)
+        kernel /boot/kernel.bin
+        module /boot/ns
+        module /boot/init
+        module /boot/devmap
+        module /boot/rd
+        module /boot/vfs
+        module /boot/tmpfs
+        module /boot/initrd.img