Drop SHAREDTREE in favor of mounting the compile dir

diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index d3395c8723fd23cf632296857f19cc2c2d930125..f321463db68de7cbc18e58e14aa2b89f83a5db93 100755 (executable)
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -59,16 +59,6 @@ mount -o loop $BASE $LOOPDIR >> $LOGFILE 2>&1
 mount -t proc none $LOOPDIR/proc >> $LOGFILE 2>&1
 cgecho "done"
 
-######################################################
-# setting up mountpoint for shared source tree
-#
-if [ "${SHAREDTREE+set}" = "set" ]; then
-    cecho " * setting up shared strongswan tree at '$SHAREDTREE'"
-    mkdir $LOOPDIR/root/strongswan-shared
-    echo "" >> $LOOPDIR/etc/fstab
-    echo "none /root/strongswan-shared hostfs $SHAREDTREE" >> $LOOPDIR/etc/fstab
-fi
-
 ######################################################
 # install software from source using 'recipes'
 #
@@ -95,6 +85,10 @@ done
 
 umount $LOOPDIR/root/compile
 
+cecho " * Setting up shared build tree at /root/compile"
+echo "" >> $LOOPDIR/etc/fstab
+echo "none /root/compile hostfs $ROOTFSCOMPILEDIR" >> $LOOPDIR/etc/fstab
+
 ######################################################
 # remove /etc/resolv.conf
 #

diff --git a/testing/testing.conf b/testing/testing.conf
index 7a4998bd607d23f34192212d839c7de6dd4f19a5..b7195bc8f5b1f8d24883e7d09318e69b9cb09a94 100755 (executable)
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -62,11 +62,6 @@ TESTRESULTSDIR=$UMLTESTDIR/testresults
 # SSH configuration (speedup SSH)
 SSHCONF="-F $UMLTESTDIR/testing/ssh_config"
 
-# Path to a full strongswan tree on the host system, which is
-# mounted into /root/strongswan-shared. This gives us an easy
-# way to apply and test changes instantly.
-#SHAREDTREE=/home/martin/strongswan/trunk
-
 # Timezone for the UMLs, look in /usr/share/zoneinfo!
 TZUML="Europe/Zurich"