Accepting request 1157121 from home:jirislaby:branches:network

- add kni-fix-build-with-Linux-6.8.patch to fix build against
  kernel 6.8.

OBS-URL: https://build.opensuse.org/request/show/1157121
OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=150
This commit is contained in:
Ana Guerrero 2024-03-18 09:29:06 +00:00 committed by Git OBS Bridge
parent 61d96b58d0
commit 21fc558ad0
3 changed files with 39 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 12 08:50:25 UTC 2024 - Jiri Slaby <jslaby@suse.cz>
- add kni-fix-build-with-Linux-6.8.patch to fix build against
kernel 6.8.
-------------------------------------------------------------------
Mon Sep 11 05:40:37 UTC 2023 - Jiri Slaby <jslaby@suse.cz>

View File

@ -1,7 +1,7 @@
#
# spec file
# spec file for package dpdk
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -59,6 +59,7 @@ Patch0: 0001-fix-cpu-compatibility.patch
Patch1: 0002-SLE15-SP3-compatibility-patch-for-kni.patch
Patch2: 0001-kni-fix-build-with-Linux-6.3.patch
Patch3: 0001-kni-fix-build-with-Linux-6.5.patch
Patch4: kni-fix-build-with-Linux-6.8.patch
BuildRequires: binutils
BuildRequires: doxygen
BuildRequires: fdupes

View File

@ -0,0 +1,30 @@
From: Jiri Slaby <jslaby@suse.cz>
Subject: kni: fix build with Linux 6.8
Patch-mainline: submitted to dev@dpdk.org, <20240312084914.92056-1-jslaby@suse.cz>
References: kernel 6.8
strlcpy() was removed in commit d26270061ae6 (string: Remove strlcpy()), use
strscpy() instead.
The patches fixes this:
kernel/linux/kni/kni_net.c: In function kni_get_drvinfo:
kernel/linux/kni/kni_net.c:835:9: error: implicit declaration of function strlcpy; did you mean strscpy?
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
kernel/linux/kni/kni_net.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -832,8 +832,8 @@ static const struct net_device_ops kni_n
static void kni_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
- strlcpy(info->version, KNI_VERSION, sizeof(info->version));
- strlcpy(info->driver, "kni", sizeof(info->driver));
+ strscpy(info->version, KNI_VERSION, sizeof(info->version));
+ strscpy(info->driver, "kni", sizeof(info->driver));
}
static const struct ethtool_ops kni_net_ethtool_ops = {