[30691] trunk/base/src/package1.0/portdmg.tcl

[source_changes at macosforge.org]

Revision: 30691
          http://trac.macosforge.org/projects/macports/changeset/30691
Author:   afb at macports.org
Date:     2007-11-04 02:58:10 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
fix hdi .dmg building / partition map for leopard

Modified Paths:
--------------
    trunk/base/src/package1.0/portdmg.tcl

Modified: trunk/base/src/package1.0/portdmg.tcl
===================================================================
--- trunk/base/src/package1.0/portdmg.tcl	2007-11-04 10:00:36 UTC (rev 30690)
+++ trunk/base/src/package1.0/portdmg.tcl	2007-11-04 10:58:10 UTC (rev 30691)
@@ -50,6 +50,7 @@
 
 proc package_dmg {portname portversion portrevision} {
     global UI_PREFIX package.destpath portpath
+    global os.version os.major
     
     if {[expr (${portrevision} > 0)]} {
         set imagename "${portname}-${portversion}-${portrevision}"
@@ -76,10 +77,19 @@
         set blocks [expr ($size/512) + ((($size/512)*3)/100)]
     }
     
+    # partition for .dmg
+    if {${os.major} >= 9} {
+	# GUID_partition_scheme
+        set subdev 1
+    } else {
+	# Apple_partition_scheme (Apple_partition_map is at s1)
+        set subdev 2
+    }
+    
     if {[system "hdiutil create -quiet -fs HFS+ -volname ${imagename} -size ${blocks}b ${tmp_image}"] != ""} {
         return -code error [format [msgcat::mc "Failed to create temporary image: %s"] ${imagename}]
     }
-    if {[catch {set devicename [exec hdid ${tmp_image} | grep "s2" | awk "{ print \$1 }"]} error]} {
+    if {[catch {set devicename [exec hdid ${tmp_image} | grep s${subdev} | awk "{ print \$1 }"]} error]} {
         return -code error [format [msgcat::mc "Failed to attach temporary image: %s"] ${error}]
     }
     set mount_point [exec mount | grep "${devicename}"]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071104/9437574e/attachment.html