Hello community,

here is the log from the commit of package dpdk for openSUSE:Factory checked in 
at 2017-05-24 16:51:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dpdk (Old)
 and      /work/SRC/openSUSE:Factory/.dpdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dpdk"

Wed May 24 16:51:28 2017 rev:16 rq:497885 version:16.11.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/dpdk/dpdk-thunderx.changes       2017-04-28 
09:13:44.782333873 +0200
+++ /work/SRC/openSUSE:Factory/.dpdk.new/dpdk-thunderx.changes  2017-05-24 
16:52:06.651827636 +0200
@@ -1,0 +2,6 @@
+Tue May 23 22:25:38 UTC 2017 - mchand...@suse.de
+
+- Add upstream patch to fix building against linux kernel 4.11
+  [+0005-kni-fix-build-with-kernel-4.11.patch]
+
+-------------------------------------------------------------------
dpdk.changes: same change

New:
----
  0005-kni-fix-build-with-kernel-4.11.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dpdk-thunderx.spec ++++++
--- /var/tmp/diff_new_pack.EWa6uS/_old  2017-05-24 16:52:07.487709959 +0200
+++ /var/tmp/diff_new_pack.EWa6uS/_new  2017-05-24 16:52:07.491709396 +0200
@@ -61,6 +61,9 @@
 Patch2:         0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch
 Patch3:         0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch
 Patch4:         0004-net-thunderx-sync-mailbox-definitions-with-Linux-PF-.patch
+# PATCH-FIX-UPSTREAM 0005-kni-fix-build-with-kernel-4.11.patch
+# This patch fixes the kni build against linux kernel 4.11
+Patch5:         0005-kni-fix-build-with-kernel-4.11.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc6
@@ -149,6 +152,8 @@
 %patch2 -p1 -z .kni1
 %patch3 -p1 -z .kni2
 %patch4 -p1 -z .thunderx
+%patch5 -p1 -z .kni3
+
 # This fixes CROSS compilation (broken) in the mk file for ThunderX
 sed -i '/^CROSS /s/^/#/'  mk/machine/thunderx/rte.vars.mk
 

dpdk.spec: same change
++++++ 0005-kni-fix-build-with-kernel-4.11.patch ++++++
>From d4d2380cbb02980bf0334601d9ce6ec5400413f9 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yi...@intel.com>
Date: Tue, 21 Mar 2017 09:54:48 +0000
Subject: [PATCH] kni: fix build with kernel 4.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

compile error:
.../build/build/lib/librte_eal/linuxapp/kni/kni_net.c:124:6:
error: implicit declaration of function ‘signal_pending’
[-Werror=implicit-function-declaration]
  if (signal_pending(current) || ret_val <= 0) {
      ^~~~~~~~~~~~~~

Linux 4.11 moves signal function declarations to its own header file:
Linux: 174cd4b1e5fb ("sched/headers: Prepare to move signal wakeup &
sigpending methods from <linux/sched.h> into <linux/sched/signal.h>")

Use new header file "linux/sched/signal.h" to fix the build error.

Cc: sta...@dpdk.org

Reported-by: Jerin Jacob <jerin.ja...@caviumnetworks.com>
Signed-off-by: Ferruh Yigit <ferruh.yi...@intel.com>
Tested-by: Jerin Jacob <jerin.ja...@caviumnetworks.com>
Tested-by: Pankaj Gupta <pagu...@redhat.com>
---
 lib/librte_eal/linuxapp/kni/compat.h  | 6 ++++++
 lib/librte_eal/linuxapp/kni/kni_dev.h | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/lib/librte_eal/linuxapp/kni/compat.h 
b/lib/librte_eal/linuxapp/kni/compat.h
index 78da08e5e..d96275af9 100644
--- a/lib/librte_eal/linuxapp/kni/compat.h
+++ b/lib/librte_eal/linuxapp/kni/compat.h
@@ -2,6 +2,8 @@
  * Minimal wrappers to allow compiling kni on older kernels.
  */
 
+#include <linux/version.h>
+
 #ifndef RHEL_RELEASE_VERSION
 #define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
 #endif
@@ -67,3 +69,7 @@
        (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)))
 #undef NET_NAME_UNKNOWN
 #endif
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+#define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
+#endif
diff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h 
b/lib/librte_eal/linuxapp/kni/kni_dev.h
index 002e5fa6c..72385ab4c 100644
--- a/lib/librte_eal/linuxapp/kni/kni_dev.h
+++ b/lib/librte_eal/linuxapp/kni/kni_dev.h
@@ -30,9 +30,15 @@
 #endif
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include "compat.h"
+
 #include <linux/if.h>
 #include <linux/wait.h>
+#ifdef HAVE_SIGNAL_FUNCTIONS_OWN_HEADER
+#include <linux/sched/signal.h>
+#else
 #include <linux/sched.h>
+#endif
 #include <linux/netdevice.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
-- 
2.12.2


Reply via email to