Changeset f0707ab in mainline

Timestamp:

2009-04-16T10:25:52Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

14fc1d9

Parents:

d15815e2

Message:

unify where to place the distribution root: always use boot/distroot

Location:

boot/arch

Files:

• amd64/Makefile.inc (modified) (4 diffs)
• ia32/Makefile.inc (modified) (6 diffs)
• sparc64/Makefile.inc (modified) (1 diff)

boot/arch/amd64/Makefile.inc

@@ -26 +26 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+TMP = distroot
 
 INIT_TASKS = \
@@ -59 +61 @@
 
 $(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
-        mkdir -p arch/$(BARCH)/iso/boot/grub
-        cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
+        mkdir -p $(TMP)/boot/grub
+        cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
 ifneq ($(RDFMT),tmpfs)
-        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
+        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" > $(TMP)/boot/grub/menu.lst
 endif
 ifneq ($(RDFMT),fat)
-        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
+        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" > $(TMP)/boot/grub/menu.lst
 endif
-        cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
+        cp $(KERNELDIR)/kernel.bin $(TMP)/boot/
         for task in $(INIT_TASKS) ; do \
-                cp $$task arch/$(BARCH)/iso/boot/ ; \
+                cp $$task $(TMP)/boot/ ; \
         done
         for file in $(RD_SRVS) ; do \
@@ -78 +80 @@
         done
 ifeq ($(RDFMT),tmpfs)
-        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
+        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
 endif
 ifeq ($(RDFMT),fat)
-        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
+        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
 endif
-        $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
-        rm arch/$(BARCH)/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/$(BARCH)/iso/
+        $(BASE)/tools/mkhord.py 4096 $(TMP)/boot/initrd.fs $(TMP)/boot/initrd.img
+        rm $(TMP)/boot/initrd.fs
+        mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $@ $(TMP)/
 
 clean:
@@ -94 +96 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        -rm -fr arch/$(BARCH)/iso
+        -rm -fr $(TMP)
         -rm -f $(BASE)/image.iso

boot/arch/ia32/Makefile.inc

@@ -27 +27 @@
 #
 
+TMP = distroot
+
 INIT_TASKS = \
         $(USPACEDIR)/srv/ns/ns \
@@ -33 +35 @@
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/rd/rd \
-        $(USPACEDIR)/srv/vfs/vfs 
+        $(USPACEDIR)/srv/vfs/vfs
 ifeq ($(RDFMT),tmpfs)
         INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
@@ -46 +48 @@
         $(USPACEDIR)/srv/kbd/kbd \
         $(USPACEDIR)/srv/console/console \
+        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
         $(USPACEDIR)/srv/fs/fat/fat
 
@@ -58 +61 @@
 
 $(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
-        mkdir -p arch/$(BARCH)/iso/boot/grub
-        cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
+        mkdir -p $(TMP)/boot/grub
+        cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
 ifneq ($(RDFMT),tmpfs)
-        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
+        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" > $(TMP)/boot/grub/menu.lst
 endif
 ifneq ($(RDFMT),fat)
-        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
+        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" > $(TMP)/boot/grub/menu.lst
 endif
-        cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
+        cp $(KERNELDIR)/kernel.bin $(TMP)/boot/
         for task in $(INIT_TASKS) ; do \
-                cp $$task arch/$(BARCH)/iso/boot/ ; \
+                cp $$task $(TMP)/boot/ ; \
         done
         for file in $(RD_SRVS) ; do \
@@ -77 +80 @@
         done
 ifeq ($(RDFMT),tmpfs)
-        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
+        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
 endif
 ifeq ($(RDFMT),fat)
-        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
+        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
 endif
-        $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
-        rm arch/$(BARCH)/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/$(BARCH)/iso/
+        $(BASE)/tools/mkhord.py 4096 $(TMP)/boot/initrd.fs $(TMP)/boot/initrd.img
+        rm $(TMP)/boot/initrd.fs
+        mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $@ $(TMP)/
 
 clean:
@@ -93 +96 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        -rm -fr arch/$(BARCH)/iso
+        -rm -fr $(TMP)
         -rm -f $(BASE)/image.iso

boot/arch/sparc64/Makefile.inc

@@ -52 +52 @@
         cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
 endif
-        mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
+        mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $@ $(TMP)/
 
 depend: