Changeset 7174403 in mainline for boot


Ignore:
Timestamp:
2012-01-25T20:25:45Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9cd8165, cf858877
Parents:
5cd3d67
Message:

the "mkisofs" is being gradually phased out in distros
be ready for that

Location:
boot
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.grub

    r5cd3d67 r7174403  
    5252$(BOOT_OUTPUT): build_dist
    5353ifeq ($(GRUB_ARCH),pc)
    54         mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
     54        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -eltorito-boot $(ELTORITO) -no-emul-boot -boot-load-size 64 -boot-info-table -o $@ $(DISTROOT)/
    5555endif
    5656ifeq ($(GRUB_ARCH),efi)
    57         mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
     57        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
    5858endif
    5959

  • boot/Makefile.silo

    r5cd3d67 r7174403  
    4141
    4242$(POST_OUTPUT): build_dist
    43         mkisofs -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
     43        $(GENISOIMAGE) -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
    4444
    4545build_dist: clean

  • boot/Makefile.yaboot

    r5cd3d67 r7174403  
    4040
    4141$(POST_OUTPUT): build_dist
    42         mkisofs -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
     42        $(GENISOIMAGE) -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
    4343
    4444build_dist: clean
Note: See TracChangeset for help on using the changeset viewer.