Changes in / [cf858877:5c5f522] in mainline

Files:

• boot/Makefile.grub (modified) (1 diff)
• boot/Makefile.silo (modified) (1 diff)
• boot/Makefile.yaboot (modified) (1 diff)
• tools/autotool.py (modified) (3 diffs)

boot/Makefile.grub

@@ -52 +52 @@
 $(BOOT_OUTPUT): build_dist
 ifeq ($(GRUB_ARCH),pc)
-        $(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)/
+        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)/
 endif
 ifeq ($(GRUB_ARCH),efi)
-        $(GENISOIMAGE) -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
+        mkisofs -J -r -input-charset utf-8 -V "HelenOS boot ISO" -efi-boot $(ELTORITO) -o $@ $(DISTROOT)/
 endif
 

boot/Makefile.silo

@@ -41 +41 @@
 
 $(POST_OUTPUT): build_dist
-        $(GENISOIMAGE) -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
+        mkisofs -f -G $(ISOFS_B_IN) -B ... -r -o $@ $(DISTROOT)/
 
 build_dist: clean

boot/Makefile.yaboot

@@ -40 +40 @@
 
 $(POST_OUTPUT): build_dist
-        $(GENISOIMAGE) -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
+        mkisofs -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
 
 build_dist: clean

tools/autotool.py

@@ -184 +184 @@
         sys.stderr.write("ok\n")
 
-def check_app_alternatives(alts, args, name, details):
-        "Check whether an application can be executed (use several alternatives)"
-        
-        tried = []
-        found = None
-        
-        for alt in alts:
-                working = True
-                cmdline = [alt] + args
-                tried.append(" ".join(cmdline))
-                
-                try:
-                        sys.stderr.write("Checking for %s ... " % alt)
-                        subprocess.Popen(cmdline, stdout = subprocess.PIPE, stderr = subprocess.PIPE).wait()
-                except:
-                        sys.stderr.write("failed\n")
-                        working = False
-                
-                if (working):
-                        sys.stderr.write("ok\n")
-                        found = alt
-                        break
-        
-        if (found is None):
-                print_error(["%s is missing." % name,
-                             "",
-                             "Please make sure that it is installed in your",
-                             "system (%s)." % details,
-                             "",
-                             "The following alternatives were tried:"] + tried)
-        
-        return found
-
 def check_gcc(path, prefix, common, details):
         "Check for GCC"
@@ -492 +459 @@
         
         for key, value in common.items():
-                if (type(value) is list):
-                        outmk.write('%s = %s\n' % (key, " ".join(value)))
-                else:
-                        outmk.write('%s = %s\n' % (key, value))
+                outmk.write('%s = %s\n' % (key, value))
         
         outmk.close()
@@ -660 +624 @@
                 # 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")
+                        check_app(["mkisofs", "--version"], "ISO 9660 creation utility", "usually part of genisoimage")
                 
                 probe = probe_compiler(common,