aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtesting/scripts/build-umlrootfs5
-rwxr-xr-xtesting/testing.conf13
2 files changed, 12 insertions, 6 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs
index 75fe5c69f..f521f9c1c 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-umlrootfs
@@ -342,6 +342,11 @@ then
echo -n " --enable-whitelist" >> $INSTALLSHELL
fi
+if [ "$USE_IFMAP" = "yes" ]
+then
+ echo -n " --enable-tnc-ifmap" >> $INSTALLSHELL
+fi
+
if [ "$USE_CISCO_QUIRKS" = "yes" ]
then
echo -n " --enable-cisco-quirks" >> $INSTALLSHELL
diff --git a/testing/testing.conf b/testing/testing.conf
index aff92bdd7..192c24f48 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -19,19 +19,19 @@ UMLTESTDIR=~/strongswan-testing
# Bzipped kernel sources
# (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.38.5.tar.bz2
+KERNEL=$UMLTESTDIR/linux-3.1.5.tar.bz2
# Extract kernel version
KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
# Kernel configuration file
-KERNELCONFIG=$UMLTESTDIR/.config-2.6.38
+KERNELCONFIG=$UMLTESTDIR/.config-3.1
# Bzipped uml patch for kernel
-UMLPATCH=$UMLTESTDIR/ha-2.6.37.patch.bz2
+UMLPATCH=$UMLTESTDIR/ha-3.0.patch.bz2
# Bzipped source of strongSwan
-STRONGSWAN=$UMLTESTDIR/strongswan-4.5.2.tar.bz2
+STRONGSWAN=$UMLTESTDIR/strongswan-4.6.2.tar.bz2
# strongSwan compile options (use "yes" or "no")
USE_LIBCURL="yes"
@@ -76,13 +76,14 @@ USE_GCM="yes"
USE_HA="yes"
USE_AF_ALG="yes"
USE_WHITELIST="yes"
+USE_IFMAP="no"
USE_CISCO_QUIRKS="no"
# Gentoo linux root filesystem
-ROOTFS=$UMLTESTDIR/gentoo-fs-20101120.tar.bz2
+ROOTFS=$UMLTESTDIR/gentoo-fs-20111212.tar.bz2
# Size of the finished root filesystem in MB
-ROOTFSSIZE=800
+ROOTFSSIZE=850
# Amount of Memory to use per UML [MB].
# If "auto" is stated 1/12 of total host ram will be used.