datapath: Support kernel version 5.0.x

This patch updated acinclude.m4 so that OVS can be compiled on
5.0.x kernels.
This patch also updated travis files so that 5.0.x kernel versions
are used during travis test builds.
Besides, NEWS and releases.rst are also updated to reflect this
new support.

Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/.travis.yml b/.travis.yml
index 7addcb2315dc611ed2c043b8cb6080c5ccc00f22..782f72fea7993be558a6d30e644e0701f6c99079 100644 (file)
--- 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 b88bfb53e251e16b4b7da8dad641b87483fb26c6..3d11b63d00911a255235650ed08bfc2a213344fc 100755 (executable)
--- 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 6c5949b33d63617c8b316476d7353294a8817e03..d9504d682c60ac6e8c8960de1e93f11e0dd6391b 100644 (file)
--- 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

diff --git a/NEWS b/NEWS
index 19cebf89a78586ec2b539d515177aa01098cdbf4..a38ab258fc6cd171f5de683cc8c4e94e8857726e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 93fbf0ebb84c5da6d533730e0e8a2a2cc4f2f0e6..321a741985dbbf6fc0773bb13a7eddb0a7afc980 100644 (file)
--- 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