diff --git a/dpdk-22.11.5.tar.xz b/dpdk-22.11.5.tar.xz deleted file mode 100644 index 0b7d227..0000000 --- a/dpdk-22.11.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:916805aee46246b81f71f831221231ef3de9c1f70223d179621980ec5d1bdf73 -size 15617920 diff --git a/dpdk-22.11.6.tar.xz b/dpdk-22.11.6.tar.xz new file mode 100644 index 0000000..6886558 --- /dev/null +++ b/dpdk-22.11.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9291448ca0e6beebbafde99d9ba8376722d5e1482e79118b6328f69e9a8e9bf +size 15626012 diff --git a/dpdk.changes b/dpdk.changes index 5a2e99c..7b340c9 100644 --- a/dpdk.changes +++ b/dpdk.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Aug 22 17:33:47 UTC 2024 - Aeneas Jaißle + +- Update to LTS release version v22.11.6 + * http://doc.dpdk.org/guides-22.11/rel_notes/release_22_11.html + +- Drop patch (included upstream): + * kni-fix-build-with-Linux-6.8.patch (22.11.6) + ------------------------------------------------------------------- Sat Aug 17 13:47:42 UTC 2024 - Aeneas Jaißle diff --git a/dpdk.spec b/dpdk.spec index 0ec1ea1..79017ff 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -46,7 +46,7 @@ %bcond_without tools # Name: dpdk%{name_tag} -Version: 22.11.5 +Version: 22.11.6 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 @@ -57,7 +57,6 @@ Source1: preamble # PATCH-FIX-OPENSUSE PATCH-FEATURE-UPSTREAM Patch0: 0001-fix-cpu-compatibility.patch Patch1: 0002-SLE15-SP3-compatibility-patch-for-kni.patch -Patch4: kni-fix-build-with-Linux-6.8.patch Patch100: kni-fix-build-with-Linux-6.10.patch BuildRequires: binutils BuildRequires: doxygen diff --git a/kni-fix-build-with-Linux-6.8.patch b/kni-fix-build-with-Linux-6.8.patch deleted file mode 100644 index 96eb0a4..0000000 --- a/kni-fix-build-with-Linux-6.8.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Jiri Slaby -Date: Tue, 12 Mar 2024 09:49:14 +0100 -Subject: kni: fix build with Linux 6.8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Git-repo: git://dpdk.org/dpdk-stable -Git-commit: 15658afda05f50e69805b891ebb4d2d5c1966d44 -Patch-mainline: yes -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’? - -Intended esp. for stable/22.11. It should go wherever kni is still in -the tree. - -Signed-off-by: Jiri Slaby -Acked-by: Luca Boccassi ---- - kernel/linux/kni/kni_net.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c -index 779ee345..c115a728 100644 ---- 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_net_netdev_ops = { - 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 = { --- -2.45.2 -