Changeset de9c5cb in mainline for boot/arch/amd64/Makefile.inc

Timestamp:

2008-09-14T14:41:31Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6aae7a3b

Parents:

dac629e

Message:

Introduce directories '/app' and '/srv' on ramdisk instead of '/sbin' to mirror source tree.

File:

• boot/arch/amd64/Makefile.inc (modified) (3 diffs)

boot/arch/amd64/Makefile.inc

@@ -41 +41 @@
 endif
 
-RD_TASKS = \
+RD_SRVS = \
         $(USPACEDIR)/srv/pci/pci \
         $(USPACEDIR)/srv/fb/fb \
         $(USPACEDIR)/srv/kbd/kbd \
         $(USPACEDIR)/srv/console/console \
+        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
+        $(USPACEDIR)/srv/fs/fat/fat
+
+RD_APPS = \
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/bdsh/bdsh \
-        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
-        $(USPACEDIR)/srv/fs/fat/fat
+        $(USPACEDIR)/app/bdsh/bdsh
 
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)
+$(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
         mkdir -p arch/$(ARCH)/iso/boot/grub
         cp arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/iso/boot/grub/
@@ -68 +70 @@
                 cp $$task arch/$(ARCH)/iso/boot/ ; \
         done
-        for task in $(RD_TASKS) ; do \
-                cp $$task $(USPACEDIR)/dist/sbin/ ; \
+        for file in $(RD_SRVS) ; do \
+                cp $$file $(USPACEDIR)/dist/srv/ ; \
+        done
+        for file in $(RD_APPS) ; do \
+                cp $$file $(USPACEDIR)/dist/app/ ; \
         done
 ifeq ($(RDFMT),tmpfs)
@@ -82 +87 @@
 
 clean:
-        -for task in $(RD_TASKS) ; do \
-                rm -f $(USPACEDIR)/dist/sbin/`basename $$task` ; \
+        -for file in $(RD_SRVS) ; do \
+                rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
+        done
+        -for file in $(RD_APPS) ; do \
+                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
         -rm -fr arch/$(ARCH)/iso