From 24d384e762ec285b5234decc642115162fd8170d571d5efc552b5dfd706014f2 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 18 Apr 2017 11:30:08 +0000 Subject: [PATCH] Accepting request 489078 from home:ndas:branches:network - Enable HAVE_TRANS_START_HELPER for SLE12SP3(bsc#1031705). [+0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch] - Enable HAVE_TRANS_START_HELPER for SLE12SP3(bsc#1031705). [+0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch] OBS-URL: https://build.opensuse.org/request/show/489078 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=45 --- ...AVE_TRANS_START_HELPER-for-SLES12SP3.patch | 31 +++++++++++++++++++ dpdk-thunderx.changes | 6 ++++ dpdk-thunderx.spec | 4 ++- dpdk.changes | 6 ++++ dpdk.spec | 4 ++- 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch diff --git a/0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch b/0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch new file mode 100644 index 0000000..8cb2dee --- /dev/null +++ b/0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch @@ -0,0 +1,31 @@ +From c284b14663fcaa2ab492496921a1fcb691abe764 Mon Sep 17 00:00:00 2001 +From: Nirmoy Das +Date: Tue, 18 Apr 2017 11:20:48 +0200 +Subject: [PATCH] kni: define HAVE_TRANS_START_HELPER for SLES12SP3 + +Add support for SLES12SP3, which uses kernel 4.4, +but backported features from newer kernels. + +Signed-off-by: Nirmoy Das +--- + lib/librte_eal/linuxapp/kni/compat.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h +index 78da08e..f781fd0 100644 +--- a/lib/librte_eal/linuxapp/kni/compat.h ++++ b/lib/librte_eal/linuxapp/kni/compat.h +@@ -51,7 +51,9 @@ + #define HAVE_SK_ALLOC_KERN_PARAM + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) \ ++ || (defined(CONFIG_SUSE_KERNEL) && \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,59)))) + #define HAVE_TRANS_START_HELPER + #endif + +-- +2.12.2 + diff --git a/dpdk-thunderx.changes b/dpdk-thunderx.changes index c9548c9..4a12e8c 100644 --- a/dpdk-thunderx.changes +++ b/dpdk-thunderx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 18 11:35:19 CEST 2017 - ndas@suse.de + +- Enable HAVE_TRANS_START_HELPER for SLE12SP3(bsc#1031705). + [+0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch] + ------------------------------------------------------------------- Tue Apr 4 15:28:20 CEST 2017 - ndas@suse.de diff --git a/dpdk-thunderx.spec b/dpdk-thunderx.spec index e9a7261..2a0414e 100644 --- a/dpdk-thunderx.spec +++ b/dpdk-thunderx.spec @@ -59,6 +59,7 @@ Source1: preamble # upstream code. Patch1: 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch Patch2: 0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch +Patch3: 0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc6 @@ -144,7 +145,8 @@ The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the %prep %setup -q -n dpdk-stable-16.11.1 %patch1 -p1 -z .enic -%patch2 -p1 -z .kni +%patch2 -p1 -z .kni1 +%patch3 -p1 -z .kni2 # This fixes CROSS compilation (broken) in the mk file for ThunderX sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk diff --git a/dpdk.changes b/dpdk.changes index c9548c9..4a12e8c 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 18 11:35:19 CEST 2017 - ndas@suse.de + +- Enable HAVE_TRANS_START_HELPER for SLE12SP3(bsc#1031705). + [+0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch] + ------------------------------------------------------------------- Tue Apr 4 15:28:20 CEST 2017 - ndas@suse.de diff --git a/dpdk.spec b/dpdk.spec index 40880ef..5113b83 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -57,6 +57,7 @@ Source1: preamble # upstream code. Patch1: 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch Patch2: 0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch +Patch3: 0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc6 @@ -142,7 +143,8 @@ The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the %prep %setup -q -n dpdk-stable-16.11.1 %patch1 -p1 -z .enic -%patch2 -p1 -z .kni +%patch2 -p1 -z .kni1 +%patch3 -p1 -z .kni2 # This fixes CROSS compilation (broken) in the mk file for ThunderX sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk