Changeset 79852

Timestamp:

06/27/11 22:21:20 (4 years ago)

Author:

jmr@…

Message:

mpab: update mpsync.sh to allow chrootless operation

File:

• contrib/mpab/mpsync.sh (modified) (5 diffs)

contrib/mpab/mpsync.sh

@@ -11 +11 @@
    dataDir=$MPAB_DATA
 fi
+if [[ -z "$PREFIX" ]]; then
+   PREFIX=/opt/local
+fi
 if [[ -z "$SRC_PREFIX" ]]; then
    SRC_PREFIX=/opt/mports
@@ -16 +19 @@
 
 chrootPath="${dataDir}/${CHROOTSUBDIR}"
+OSMajor=`uname -r | sed 's/\..*//'`
+# xcodebuild breaks in chroots on 10.6
+if [[ $1 = "-n" || $OSMajor -ge 10 ]]; then
+    chrootPath=""
+    if [[ $1 = "-n" ]]; then
+        shift
+    fi
+fi
 
 # $1 - script to execute
 function chroot_exec () {
-    cp -p ${baseDir}/chroot-scripts/$1 ${chrootPath}/var/tmp/
-    # Set DYLD_NO_FIX_PREBINDING as otherwise, on 10.5, dyld will spew
-    # errors to syslog/console log like:
-    # com.apple.launchd[1] (com.apple.dyld): Throttling respawn: Will start in 10 seconds
-    env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin HOME=/var/root DYLD_NO_FIX_PREBINDING=1 /usr/sbin/chroot ${chrootPath} /bin/sh /var/tmp/$1
+    cp -p ${baseDir}/chroot-scripts/$1 ${chrootPath}/var/tmp
+    if [[ -n "$chrootPath" ]]; then
+        # Set DYLD_NO_FIX_PREBINDING as otherwise, on 10.5, dyld will spew
+        # errors to syslog/console log like:
+        # com.apple.launchd[1] (com.apple.dyld): Throttling respawn: Will start in 10 seconds
+        env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin HOME=/var/root DYLD_NO_FIX_PREBINDING=1 PREFIX=${PREFIX} SRC_PREFIX=${SRC_PREFIX} /usr/sbin/chroot ${chrootPath} /bin/sh /var/tmp/$1
+    else
+        env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin HOME=/var/root PREFIX=${PREFIX} SRC_PREFIX=${SRC_PREFIX} /bin/sh /var/tmp/$1
+    fi
     rm ${chrootPath}/var/tmp/$1
 }
@@ -29 +44 @@
 if [[ -d ${dataDir}/${exportDir} ]] ; then 
     svn update --non-interactive \
-        -r HEAD ${dataDir}/${exportDir} \
+        -r HEAD ${dataDir}/${exportDir}/* \
         > /dev/null || exit 1
 else
@@ -38 +53 @@
 fi
 
-if [[ ! -d ${chrootPath} ]] ; then
+if [[ -n "$chrootPath" && ! -d "$chrootPath" ]] ; then
     sudo ${baseDir}/mpab mount || exit 1
     umount=yes
@@ -47 +62 @@
     ${chrootPath}${SRC_PREFIX} || exit 1
 
-echo "Re-creating portindex in chroot"
+echo "Re-creating portindex"
 chroot_exec recreateportindex