aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2008-07-25 10:30:53 +0000
committerAndreas Steffen <andreas.steffen@strongswan.org>2008-07-25 10:30:53 +0000
commit286350961603543893f8632e32a70b6fd6c98979 (patch)
treec4be879b48e2f5c33a880e0945066e31a652779d
parent77a06476dcca6cbf15ba55cefb11257a5a315338 (diff)
downloadstrongswan-286350961603543893f8632e32a70b6fd6c98979.tar.bz2
strongswan-286350961603543893f8632e32a70b6fd6c98979.tar.xz
updated UML INSTALL information4.2.5
-rw-r--r--testing/INSTALL11
-rwxr-xr-xtesting/testing.conf5
2 files changed, 7 insertions, 9 deletions
diff --git a/testing/INSTALL b/testing/INSTALL
index 3e9d97f15..df7eb34a9 100644
--- a/testing/INSTALL
+++ b/testing/INSTALL
@@ -53,17 +53,16 @@ are required for the strongSwan testing environment:
* A vanilla Linux kernel on which the UML kernel will be based on.
We recommend the use of
- http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.4.tar.bz2
+ http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2
- * Starting with Linux kernel 2.6.9 no patch must be applied any more in order
- to make the vanilla kernel UML-capable. For older kernels you'll find
- a matching UML patch at
+ * The Linux kernel 2.6.26 requires the following patch for the uml guest kernel
+ to successfully start up:
- http://prdownloads.sourceforge.net/user-mode-linux/
+ http://download.strongswan.org/uml/uml-2.6.26.patch.bz2
* The matching .config file required to compile the UML kernel:
- http://download.strongswan.org/uml/.config-2.6.24
+ http://download.strongswan.org/uml/.config-2.6.26
* A gentoo-based UML file system (compressed size 130 MBytes) found at
diff --git a/testing/testing.conf b/testing/testing.conf
index 6011deb47..2ac1fa069 100755
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -21,7 +21,7 @@ UMLTESTDIR=~/strongswan-testing
# Bzipped kernel sources
# (file extension .tar.bz2 required)
-KERNEL=$UMLTESTDIR/linux-2.6.26-rc8.tar.bz2
+KERNEL=$UMLTESTDIR/linux-2.6.26.tar.bz2
# Extract kernel version
KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@@ -30,8 +30,7 @@ KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
KERNELCONFIG=$UMLTESTDIR/.config-2.6.26
# Bzipped uml patch for kernel
-# (not needed anymore for 2.6.9 kernel or higher)
-#UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
+UMLPATCH=$UMLTESTDIR/uml-2.6.26.patch.bz2
# Bzipped source of strongSwan
STRONGSWAN=$UMLTESTDIR/strongswan-4.2.5.tar.bz2