| Message ID | 1560210191-9414-6-git-send-email-pkusunyifeng@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | datapath: Support 5.0.x kernel version | expand |
On Mon, Jun 10, 2019 at 4:46 PM Yifeng Sun <pkusunyifeng@gmail.com> wrote: > > 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. > > Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com> > --- > .travis.yml | 1 + > .travis/linux-build.sh | 4 +++- > Documentation/faq/releases.rst | 2 +- > NEWS | 1 + > acinclude.m4 | 10 ++++++---- > 5 files changed, 12 insertions(+), 6 deletions(-) The following hunk is rejected because of an update in .travis.yml. It should be easily resolved. Acked-by: Yi-Hung Wei <yihung.wei@gmail.com> > diff --git a/.travis.yml b/.travis.yml > index 6621fb53575f..cb96d13cf537 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -35,6 +35,7 @@ env: > - KERNEL=3.16 TESTSUITE=1 DPDK=1 > - KERNEL=3.16 DPDK_SHARED=1 > - KERNEL=3.16 DPDK_SHARED=1 OPTS="--enable-shared" > + - KERNEL=5.0 > - KERNEL=4.20 > - KERNEL=4.19 > - KERNEL=4.18
Thanks Yi-Hung, I will rebase .travis.yml, fix the small issue you mentioned in another email, and send v2. Yifeng On Wed, Jun 12, 2019 at 2:21 PM Yi-Hung Wei <yihung.wei@gmail.com> wrote: > > On Mon, Jun 10, 2019 at 4:46 PM Yifeng Sun <pkusunyifeng@gmail.com> wrote: > > > > 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. > > > > Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com> > > --- > > .travis.yml | 1 + > > .travis/linux-build.sh | 4 +++- > > Documentation/faq/releases.rst | 2 +- > > NEWS | 1 + > > acinclude.m4 | 10 ++++++---- > > 5 files changed, 12 insertions(+), 6 deletions(-) > > The following hunk is rejected because of an update in .travis.yml. > It should be easily resolved. > > Acked-by: Yi-Hung Wei <yihung.wei@gmail.com> > > > > diff --git a/.travis.yml b/.travis.yml > > index 6621fb53575f..cb96d13cf537 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -35,6 +35,7 @@ env: > > - KERNEL=3.16 TESTSUITE=1 DPDK=1 > > - KERNEL=3.16 DPDK_SHARED=1 > > - KERNEL=3.16 DPDK_SHARED=1 OPTS="--enable-shared" > > + - KERNEL=5.0 > > - KERNEL=4.20 > > - KERNEL=4.19 > > - KERNEL=4.18
diff --git a/.travis.yml b/.travis.yml index 6621fb53575f..cb96d13cf537 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ env: - KERNEL=3.16 TESTSUITE=1 DPDK=1 - KERNEL=3.16 DPDK_SHARED=1 - KERNEL=3.16 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 123cde575667..bb97600c9789 100755 --- a/.travis/linux-build.sh +++ b/.travis/linux-build.sh @@ -11,7 +11,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 6c5949b33d63..d9504d682c60 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 diff --git a/NEWS b/NEWS index 19cebf89a785..a38ab258fc6c 100644 --- 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 93fbf0ebb84c..321a741985db 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
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. Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com> --- .travis.yml | 1 + .travis/linux-build.sh | 4 +++- Documentation/faq/releases.rst | 2 +- NEWS | 1 + acinclude.m4 | 10 ++++++---- 5 files changed, 12 insertions(+), 6 deletions(-)