rpm/dpdk
SHA256
1
0
Fork 0
forked from pool/dpdk
Code Pull Requests Activity

Accepting request 836050 from network

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/836050
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpdk?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2020-09-22 19:15:27 +00:00 committed by Git OBS Bridge
commit d78d5091d9
5 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0001-SLE15-SP3-compatibility-patch-for-kni.patch Normal file
View File

@ -0,0 +1,37 @@
From 430a4b50f2f7e5f21c7c2f81849588c575018501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Caama=C3=B1o=20Ruiz?= <jcaamano@suse.com>
Date: Mon, 21 Sep 2020 14:50:13 +0200
Subject: [PATCH] SLE15 SP3 compatibility patch for kni
---
kernel/linux/kni/compat.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 9ee45dbf6..9dee63af2 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -14,7 +14,10 @@
#define SLE_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
#endif
#ifdef CONFIG_SUSE_KERNEL
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
+#if (defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && \
+ defined(CONFIG_SUSE_PATCHLEVEL) && CONFIG_SUSE_PATCHLEVEL == 3)
+#define SLE_VERSION_CODE SLE_VERSION(15, 3, 0)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
/* SLES12SP3 is at least 4.4.57+ based */
#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 28))
@@ -131,6 +134,7 @@
#define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT
#endif
-#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE
+#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \
+ (SLE_VERSION_CODE && SLE_VERSION_CODE == SLE_VERSION(15, 3, 0))
#define HAVE_TX_TIMEOUT_TXQUEUE
#endif
--
2.26.2

3
dpdk-19.11.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0114e0293428d25a492b352236ebd8829fbee328ca63d799dfc272a0f63134d
size 12416036

3
dpdk-19.11.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:657070a669364efef66b8b8bbe862f2611b367b6126969c43acdc06f2a172dbd
size 12433520

10
dpdk.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Sep 22 08:13:23 UTC 2020 - Jaime Caamaño Ruiz <jcaamano@suse.com>
- Update to 19.11.4. For a list of fixes check:
https://doc.dpdk.org/guides-19.11/rel_notes/release_19_11.html#id8
- Add patch to resolve build error reported in Staging:E project
where a kernel backport (jsc#SLE-13536) introduced backward
incompatible changes to the API that break kni module build
* 0001-SLE15-SP3-compatibility-patch-for-kni.patch
-------------------------------------------------------------------
Tue Aug 11 06:56:10 UTC 2020 - Dirk Mueller <dmueller@suse.com>

4
dpdk.spec
View File

@ -53,7 +53,7 @@
# Add option to build without tools
%bcond_without tools
Name: dpdk%{name_tag}
Version: 19.11.3
Version: 19.11.4
Release: 0
Summary: Set of libraries and drivers for fast packet processing
License: BSD-3-Clause AND GPL-2.0-only AND LGPL-2.1-only
@ -62,6 +62,7 @@ URL: http://dpdk.org
Source: http://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
Source1: preamble
Patch1: 0001-fix-cpu-compatibility.patch
Patch2: 0001-SLE15-SP3-compatibility-patch-for-kni.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: libelf-devel
@ -159,6 +160,7 @@ The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the
# can't use %{name} because of dpdk-thunderx
%setup -q -n dpdk-stable-%{version}
%patch1 -p1 -z .init
%patch2 -p1 -z .init
# This fixes CROSS compilation (broken) in the mk file for ThunderX
sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk