Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset f0707ab in mainline


Ignore:
Timestamp:
2009-04-16T10:25:52Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
Children:
14fc1d9
Parents:
d15815e2
Message:

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

Location:
boot/arch
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • boot/arch/amd64/Makefile.inc

    rd15815e2 rf0707ab  
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727#
     28
     29TMP = distroot
    2830
    2931INIT_TASKS = \
     
    5961
    6062$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
    61         mkdir -p arch/$(BARCH)/iso/boot/grub
    62         cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
     63        mkdir -p $(TMP)/boot/grub
     64        cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
    6365ifneq ($(RDFMT),tmpfs)
    64         cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
     66        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" > $(TMP)/boot/grub/menu.lst
    6567endif
    6668ifneq ($(RDFMT),fat)
    67         cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
     69        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" > $(TMP)/boot/grub/menu.lst
    6870endif
    69         cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
     71        cp $(KERNELDIR)/kernel.bin $(TMP)/boot/
    7072        for task in $(INIT_TASKS) ; do \
    71                 cp $$task arch/$(BARCH)/iso/boot/ ; \
     73                cp $$task $(TMP)/boot/ ; \
    7274        done
    7375        for file in $(RD_SRVS) ; do \
     
    7880        done
    7981ifeq ($(RDFMT),tmpfs)
    80         $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
     82        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
    8183endif
    8284ifeq ($(RDFMT),fat)
    83         $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
     85        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
    8486endif
    85         $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
    86         rm arch/$(BARCH)/iso/boot/initrd.fs
    87         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/
     87        $(BASE)/tools/mkhord.py 4096 $(TMP)/boot/initrd.fs $(TMP)/boot/initrd.img
     88        rm $(TMP)/boot/initrd.fs
     89        mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $@ $(TMP)/
    8890
    8991clean:
     
    9496                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    9597        done
    96         -rm -fr arch/$(BARCH)/iso
     98        -rm -fr $(TMP)
    9799        -rm -f $(BASE)/image.iso
  • boot/arch/ia32/Makefile.inc

    rd15815e2 rf0707ab  
    2727#
    2828
     29TMP = distroot
     30
    2931INIT_TASKS = \
    3032        $(USPACEDIR)/srv/ns/ns \
     
    3335        $(USPACEDIR)/srv/devmap/devmap \
    3436        $(USPACEDIR)/srv/rd/rd \
    35         $(USPACEDIR)/srv/vfs/vfs 
     37        $(USPACEDIR)/srv/vfs/vfs
    3638ifeq ($(RDFMT),tmpfs)
    3739        INIT_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
     
    4648        $(USPACEDIR)/srv/kbd/kbd \
    4749        $(USPACEDIR)/srv/console/console \
     50        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    4851        $(USPACEDIR)/srv/fs/fat/fat
    4952
     
    5861
    5962$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
    60         mkdir -p arch/$(BARCH)/iso/boot/grub
    61         cp arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/iso/boot/grub/
     63        mkdir -p $(TMP)/boot/grub
     64        cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
    6265ifneq ($(RDFMT),tmpfs)
    63         cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" >arch/$(BARCH)/iso/boot/grub/menu.lst
     66        cat arch/$(BARCH)/grub/menu.lst | grep -v "tmpfs" > $(TMP)/boot/grub/menu.lst
    6467endif
    6568ifneq ($(RDFMT),fat)
    66         cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" >arch/$(BARCH)/iso/boot/grub/menu.lst
     69        cat arch/$(BARCH)/grub/menu.lst | grep -v "fat" > $(TMP)/boot/grub/menu.lst
    6770endif
    68         cp $(KERNELDIR)/kernel.bin arch/$(BARCH)/iso/boot/
     71        cp $(KERNELDIR)/kernel.bin $(TMP)/boot/
    6972        for task in $(INIT_TASKS) ; do \
    70                 cp $$task arch/$(BARCH)/iso/boot/ ; \
     73                cp $$task $(TMP)/boot/ ; \
    7174        done
    7275        for file in $(RD_SRVS) ; do \
     
    7780        done
    7881ifeq ($(RDFMT),tmpfs)
    79         $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
     82        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
    8083endif
    8184ifeq ($(RDFMT),fat)
    82         $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ arch/$(BARCH)/iso/boot/initrd.fs
     85        $(BASE)/tools/mkfat.py $(USPACEDIR)/dist/ $(TMP)/boot/initrd.fs
    8386endif
    84         $(BASE)/tools/mkhord.py 4096 arch/$(BARCH)/iso/boot/initrd.fs arch/$(BARCH)/iso/boot/initrd.img
    85         rm arch/$(BARCH)/iso/boot/initrd.fs
    86         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/
     87        $(BASE)/tools/mkhord.py 4096 $(TMP)/boot/initrd.fs $(TMP)/boot/initrd.img
     88        rm $(TMP)/boot/initrd.fs
     89        mkisofs -J -r -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table -o $@ $(TMP)/
    8790
    8891clean:
     
    9396                rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
    9497        done
    95         -rm -fr arch/$(BARCH)/iso
     98        -rm -fr $(TMP)
    9699        -rm -f $(BASE)/image.iso
  • boot/arch/sparc64/Makefile.inc

    rd15815e2 rf0707ab  
    5252        cp arch/$(BARCH)/loader/initrd.img $(TMP)/HelenOS/initrd.img
    5353endif
    54         mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $(BASE)/image.iso $(TMP)/
     54        mkisofs -f -G $(TMP)/boot/isofs.b -B ... -r -o $@ $(TMP)/
    5555
    5656depend:
Note: See TracChangeset for help on using the changeset viewer.