Changeset 677f620 in mainline for boot/arch/amd64/Makefile.inc


Ignore:
Timestamp:
2008-08-05T21:52:14Z (17 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
30b3ddb
Parents:
0928526
Message:

Split mktmpfs.py to a TMPFS specific part and a HORD specific part. The latter
is moved to mkhord.py and can be reused for FAT16 images as well. mktmpfs.py and
mkfat.sh define the same interface now. Modify makefiles to use the modified
interface (e.g. do not pass alignment to either mktmpfs.py or mkfat.sh). FAT16
initrd image can be now loaded as initrd on amd64 and gets recognized as a
ramdisk image.

File:
1 edited

Legend:

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

    r0928526 r677f620  
    4949        $(USPACEDIR)/app/tester/tester \
    5050        $(USPACEDIR)/app/klog/klog \
    51         $(USPACEDIR)/app/cli/cli
    52 ifneq ($(RDFMT),tmpfs)
    53         RD_TASKS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
    54 endif
    55 ifneq ($(RDFMT),fat)
    56         RD_TASKS += $(USPACEDIR)/srv/fs/fat/fat
    57 endif
     51        $(USPACEDIR)/app/cli/cli \
     52        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
     53        $(USPACEDIR)/srv/fs/fat/fat
    5854
    5955build: $(BASE)/image.iso
     
    7672        done
    7773ifeq ($(RDFMT),tmpfs)
    78         $(BASE)/tools/mktmpfs.py 4096 $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
     74        $(BASE)/tools/mktmpfs.py $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs.img
    7975endif
    8076ifeq ($(RDFMT),fat)
    81         $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.img
     77        $(BASE)/tools/mkfat.sh $(USPACEDIR)/dist/ arch/$(ARCH)/iso/boot/initrd.fs.img
    8278endif
     79        $(BASE)/tools/mkhord.py 4096 arch/$(ARCH)/iso/boot/initrd.fs.img arch/$(ARCH)/iso/boot/initrd.img
     80        rm arch/$(ARCH)/iso/boot/initrd.fs.img
    8381        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/
    8482
Note: See TracChangeset for help on using the changeset viewer.