diff --git a/dpdk.changes b/dpdk.changes index cb4606e..644780c 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 12 08:50:25 UTC 2024 - Jiri Slaby + +- 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 diff --git a/dpdk.spec b/dpdk.spec index d4bb4a0..d128a32 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -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 diff --git a/kni-fix-build-with-Linux-6.8.patch b/kni-fix-build-with-Linux-6.8.patch new file mode 100644 index 0000000..0c936aa --- /dev/null +++ b/kni-fix-build-with-Linux-6.8.patch @@ -0,0 +1,30 @@ +From: Jiri Slaby +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 +--- + 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 = {