Changeset cf858877 in mainline

Timestamp:

2012-01-26T08:51:45Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ea75ceb

Parents:

5c5f522 (diff), 7174403 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 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)
-        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)/
+        $(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)/
 endif
 ifeq ($(GRUB_ARCH),efi)
-        mkisofs -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
 

boot/Makefile.silo

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

boot/Makefile.yaboot

@@ -40 +40 @@
 
 $(POST_OUTPUT): build_dist
-        mkisofs -hfs -part -map $(MAPS) -no-desktop -hfs-volid "HelenOS" -hfs-bless $(DISTROOT)/boot -r -o $@ $(DISTROOT)/
+        $(GENISOIMAGE) -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"
@@ -459 +492 @@
         
         for key, value in common.items():
-                outmk.write('%s = %s\n' % (key, value))
+                if (type(value) is list):
+                        outmk.write('%s = %s\n' % (key, " ".join(value)))
+                else:
+                        outmk.write('%s = %s\n' % (key, value))
         
         outmk.close()
@@ -624 +660 @@
                 # Platform-specific utilities
                 if ((config['BARCH'] == "amd64") or (config['BARCH'] == "ia32") or (config['BARCH'] == "ppc32") or (config['BARCH'] == "sparc64")):
-                        check_app(["mkisofs", "--version"], "ISO 9660 creation utility", "usually part of genisoimage")
+                        common['GENISOIMAGE'] = check_app_alternatives(["mkisofs", "genisoimage"], ["--version"], "ISO 9660 creation utility", "usually part of genisoimage")
                 
                 probe = probe_compiler(common,