diff options
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | .travis/linux-build.sh | 4 | ||||
| -rw-r--r-- | Documentation/faq/releases.rst | 2 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | acinclude.m4 | 10 |
5 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 7addcb231..782f72fea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ env: - TESTSUITE=1 DPDK=1 - DPDK_SHARED=1 - DPDK_SHARED=1 OPTS="--enable-shared" + - KERNEL=5.0 - KERNEL=4.20 - KERNEL=4.19 - KERNEL=4.18 diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh index b88bfb53e..3d11b63d0 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -10,7 +10,9 @@ TARGET="x86_64-native-linuxapp-gcc" function install_kernel() { - if [[ "$1" =~ ^4.* ]]; then + if [[ "$1" =~ ^5.* ]]; then + PREFIX="v5.x" + elif [[ "$1" =~ ^4.* ]]; then PREFIX="v4.x" elif [[ "$1" =~ ^3.* ]]; then PREFIX="v3.x" diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst index 6c5949b33..d9504d682 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -68,7 +68,7 @@ Q: What Linux kernel versions does each Open vSwitch release work with? 2.8.x 3.10 to 4.12 2.9.x 3.10 to 4.13 2.10.x 3.10 to 4.17 - 2.11.x 3.10 to 4.18 + 2.11.x 3.10 to 5.0 ============ ============== Open vSwitch userspace should also work with the Linux kernel module built @@ -46,6 +46,7 @@ Post-v2.11.0 - Added support for TLS Server Name Indication (SNI). - Linux datapath: * Support for the kernel versions 4.19.x and 4.20.x. + * Support for the kernel version 5.0.x. v2.11.0 - 19 Feb 2019 diff --git a/acinclude.m4 b/acinclude.m4 index 93fbf0ebb..321a74198 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -150,12 +150,14 @@ AC_DEFUN([OVS_CHECK_LINUX], [ fi AC_MSG_RESULT([$kversion]) - if test "$version" -ge 4; then - if test "$version" = 4 && test "$patchlevel" -le 20; then - : # Linux 4.x + if test "$version" -ge 5; then + if test "$version" = 5 && test "$patchlevel" -le 0; then + : # Linux 5.x else - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.20.x is not supported (please refer to the FAQ for advice)]) + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 5.0.x is not supported (please refer to the FAQ for advice)]) fi + elif test "$version" = 4; then + : # Linux 4.x elif test "$version" = 3 && test "$patchlevel" -ge 10; then : # Linux 3.x else |