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

Changeset b6bbc74 in mainline


Ignore:
Timestamp:
2016-03-04T00:45:15Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
36b0490e, df425da
Parents:
1c24c7c
Message:

Add support for xorriso as alternative to mkisofs/genisoimage.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.grub

    r1c24c7c rb6bbc74  
    5555endif
    5656ifeq ($(GRUB_ARCH),efi)
    57         $(GENISOIMAGE) -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
  • tools/autotool.py

    r1c24c7c rb6bbc74  
    924924                # Platform-specific utilities
    925925                if ((config['BARCH'] == "amd64") or (config['BARCH'] == "ia32") or (config['BARCH'] == "ppc32") or (config['BARCH'] == "sparc64")):
    926                         common['GENISOIMAGE'] = check_app_alternatives(["mkisofs", "genisoimage"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
     926                        common['GENISOIMAGE'] = check_app_alternatives(["xorriso", "mkisofs", "genisoimage"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
     927                        if common['GENISOIMAGE'] == 'xorriso':
     928                            common['GENISOIMAGE'] += ' -as genisoimage'
    927929               
    928930                probe = probe_compiler(common,
Note: See TracChangeset for help on using the changeset viewer.