diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | .travis/build.sh | 4 | ||||
| -rw-r--r-- | FAQ.md | 2 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 10 |
5 files changed, 12 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index ffb9744fe..36d95bdf8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - TESTSUITE=1 KERNEL=3.18.1 - TESTSUITE=1 OPTS="--enable-shared" - BUILD_ENV="-m32" OPTS="--disable-ssl" + - KERNEL=4.0.2 - KERNEL=3.17.7 DPDK=1 - KERNEL=3.17.7 DPDK=1 OPTS="--enable-shared" - KERNEL=3.17.7 diff --git a/.travis/build.sh b/.travis/build.sh index 6dfc9fe14..e90f4d08b 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -9,7 +9,9 @@ EXTRA_OPTS="" function install_kernel() { - if [[ "$1" =~ ^3.* ]]; then + if [[ "$1" =~ ^4.* ]]; then + PREFIX="v4.x" + elif [[ "$1" =~ ^3.* ]]; then PREFIX="v3.x" else PREFIX="v2.6/longterm/v2.6.32" @@ -156,7 +156,7 @@ A: The following table lists the Linux kernel versions against which the | 2.0.x | 2.6.32 to 3.10 | 2.1.x | 2.6.32 to 3.11 | 2.3.x | 2.6.32 to 3.14 -| 2.4.x | 2.6.32 to 3.19 +| 2.4.x | 2.6.32 to 4.0 Open vSwitch userspace should also work with the Linux kernel module built into Linux 3.3 and later. @@ -65,7 +65,7 @@ Post-v2.3.0 - Added support for DPDK Tunneling. VXLAN, GRE, and Geneve are supported protocols. This is generic tunneling mechanism for userspace datapath. - Support for multicast snooping (IGMPv1 and IGMPv2) - - Support for Linux kernels up to 3.19.x + - Support for Linux kernels up to 4.0.x - The documentation now use the term 'destination' to mean one of syslog, console or file for vlog logging instead of the previously used term 'facility'. diff --git a/acinclude.m4 b/acinclude.m4 index e9d0ed968..aab7df8c9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -133,12 +133,14 @@ AC_DEFUN([OVS_CHECK_LINUX], [ fi AC_MSG_RESULT([$kversion]) - if test "$version" -ge 3; then - if test "$version" = 3 && test "$patchlevel" -le 19; then - : # Linux 3.x + if test "$version" -ge 4; then + if test "$version" = 4 && test "$patchlevel" -le 0; then + : # Linux 4.x else - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.19.x is not supported (please refer to the FAQ for advice)]) + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.0.x is not supported (please refer to the FAQ for advice)]) fi + elif test "$version" = 3; then + : # Linux 3.x else if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version 2.6.32 or later is required]) |