Changeset b6bbc74 in mainline

Timestamp:

2016-03-04T00:45:15Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36b0490e, df425da

Parents:

1c24c7c

Message:

Add support for xorriso as alternative to mkisofs/genisoimage.

Files:

• boot/Makefile.grub (modified) (1 diff)
• tools/autotool.py (modified) (1 diff)

boot/Makefile.grub

@@ -55 +55 @@
 endif
 ifeq ($(GRUB_ARCH),efi)
-        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
+        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" --efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
 endif
 

tools/autotool.py

@@ -924 +924 @@
                 # Platform-specific utilities
                 if ((config['BARCH'] == "amd64") or (config['BARCH'] == "ia32") or (config['BARCH'] == "ppc32") or (config['BARCH'] == "sparc64")):
-                        common['GENISOIMAGE'] = check_app_alternatives(["mkisofs", "genisoimage"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
+                        common['GENISOIMAGE'] = check_app_alternatives(["xorriso", "mkisofs", "genisoimage"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
+                        if common['GENISOIMAGE'] == 'xorriso':
+                            common['GENISOIMAGE'] += ' -as genisoimage'
                 
                 probe = probe_compiler(common,