Changeset 80242

Timestamp:

07/07/11 09:33:44 (4 years ago)

Author:

jmr@…

Message:

mpab: restrict svn checkout to base and dports, and look at BASE_UPDATE env var that specifies how to update the base install

Location:

contrib/mpab

Files:

• chroot-scripts/selfupdate (added)
• mpexport.sh (modified) (1 diff)
• mpsync.sh (modified) (2 diffs)

contrib/mpab/mpexport.sh

@@ -1 @@
-#/bin/sh
-svn checkout -r HEAD https://svn.macports.org/repository/macports/trunk mpexport
+#!/bin/sh
+mkdir -p mpexport
+svn checkout --non-interactive -r HEAD https://svn.macports.org/repository/macports/trunk/base mpexport/base
+svn checkout --non-interactive -r HEAD https://svn.macports.org/repository/macports/trunk/dports mpexport/dports
 cd mpexport
 tar c --exclude '.svn' -f - . | bzip2 -c > ../macports_dist.tar.bz2

contrib/mpab/mpsync.sh

@@ -46 +46 @@
 if [[ -d ${dataDir}/${exportDir} ]] ; then 
     svn update --non-interactive \
-        -r HEAD ${dataDir}/${exportDir}/* || exit 1
+            -r HEAD ${dataDir}/${exportDir}/base || exit 1
+        svn update --non-interactive \
+            -r HEAD ${dataDir}/${exportDir}/dports || exit 1
 else
     echo "Checking out macports from svn..."
+    mkdir -p ${dataDir}/${exportDir}
     svn checkout --non-interactive -r HEAD \
-        https://svn.macports.org/repository/macports/trunk \
-        ${dataDir}/${exportDir} || exit 1
+            https://svn.macports.org/repository/macports/trunk/base \
+            ${dataDir}/${exportDir}/base || exit 1
+        svn checkout --non-interactive -r HEAD \
+            https://svn.macports.org/repository/macports/trunk/dports \
+            ${dataDir}/${exportDir}/dports || exit 1
 fi
 
@@ -66 +72 @@
 chroot_exec recreateportindex
 
+if [[ "$BASE_UPDATE" == "selfupdate" ]]; then
+    chroot_exec selfupdate
+elif [[ "$BASE_UPDATE" == "svn" ]]; then
+    chroot_exec installmacports
+fi
+
 if [[ "${umount}" = yes ]] ; then
     sudo ${baseDir}/mpab umount || exit 1