Accepting request 1283587 from network

- Fix deterministic build [bsc#1244130]
  [+ 0001-dts-generate-random-capture_name-per-call.patch]

OBS-URL: https://build.opensuse.org/request/show/1283587
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dpdk?expand=0&rev=73

0001-always_inline-fix.patch

@@ -0,0 +1,35 @@
+From a9ae58b265d580a1b7048e0686a626d7b2538d18 Mon Sep 17 00:00:00 2001
+From: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
+Date: Tue, 1 Apr 2025 10:05:47 +0200
+Subject: [PATCH] rte_trace: rte_trace_feature_is_enabled as makro
+
+---
+ lib/eal/include/rte_trace.h | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/lib/eal/include/rte_trace.h b/lib/eal/include/rte_trace.h
+index 90af760194..df95674277 100644
+--- a/lib/eal/include/rte_trace.h
++++ b/lib/eal/include/rte_trace.h
+@@ -44,16 +44,11 @@ bool rte_trace_is_enabled(void);
+  * @return
+  *   true if trace feature is enabled, false otherwise.
+  */
+-__rte_experimental
+-static __rte_always_inline bool
+-rte_trace_feature_is_enabled(void)
+-{
+ #ifdef RTE_TRACE
+-	return true;
++#define rte_trace_feature_is_enabled() (true)
+ #else
+-	return false;
++#define rte_trace_feature_is_enabled() (false)
+ #endif
+-}
+ 
+ /**
+  * Enumerate trace mode operation.
+-- 
+2.43.0
+

0001-dts-generate-random-capture_name-per-call.patch

@@ -0,0 +1,41 @@
+From a1601d25a7c05e9b572c5055ffd460f7b902258c Mon Sep 17 00:00:00 2001
+From: Clemens Famulla-Conrad <cfamullaconrad@suse.de>
+Date: Thu, 5 Jun 2025 16:48:27 +0200
+Subject: [PATCH 1/1] dts: generate random capture_name per call
+Reference: boo#1244130
+
+Previously, `capture_name` defaulted to a "dynamic" value. This caused
+non-deterministic documentation (as reported in
+https://bugs.dpdk.org/show_bug.cgi?id=1718) and could lead to
+overwriting capture files if the method was called
+multiple times within a single Python process.
+---
+ .../traffic_generator/capturing_traffic_generator.py         | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
+index 66a77da9c4..c1e4a898d4 100644
+--- a/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
++++ b/dts/framework/testbed_model/traffic_generator/capturing_traffic_generator.py
+@@ -70,7 +70,7 @@ def send_packets_and_capture(
+         receive_port: Port,
+         filter_config: PacketFilteringConfig,
+         duration: float,
+-        capture_name: str = _get_default_capture_name(),
++        capture_name: str = None,
+     ) -> list[Packet]:
+         """Send `packets` and capture received traffic.
+ 
+@@ -104,6 +104,9 @@ def send_packets_and_capture(
+             duration,
+         )
+ 
++        if capture_name is None:
++            capture_name = _get_default_capture_name()
++
+         self._logger.debug(f"Received packets: {get_packet_summaries(received_packets)}")
+         self._write_capture_from_packets(capture_name, received_packets)
+         return received_packets
+-- 
+2.43.0
+

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <package>thunderx</package>
-</multibuild>

dpdk.changes

@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Thu Jun  5 14:55:25 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Fix deterministic build [bsc#1244130]
+  [+ 0001-dts-generate-random-capture_name-per-call.patch]
+
+-------------------------------------------------------------------
+Tue Apr  1 09:54:21 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Change 0001-always_inline-fix.patch by replacing the function
+  rte_trace_feature_is_enabled with a preprocessor substitution, 
+  this also work with older gcc7 where -mgeneral-regs-only isn't 
+  available.
+
+-------------------------------------------------------------------
+Mon Mar 31 11:49:34 UTC 2025 - Richard Biener <rguenther@suse.com>
+
+- Add 0001-always_inline-fix.patch to fix issue with always_inline
+  and rte_trace_feature_is_enabled which should use -mgeneral-regs-only
+  to inter-operate with other ISA flags.  Remove GCC 14 build requirement
+  for SLE15/16 again.
+
+-------------------------------------------------------------------
+Fri Mar 14 13:37:33 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Remove the 'thunderx' multibuild flavor; it was identical to aarch64.
+  It also makes 'Provides: dpdk-any' obsolete. [bsc#1237385]
+
+-------------------------------------------------------------------
+Mon Mar 10 13:21:19 UTC 2025 - Clemens Famulla-Conrad <cfamullaconrad@suse.com>
+
+- Update to version 24.11.1
+  * Contains DPDK 24.11 plus the fix for CVE-2024-11614,
+    remove patch dpdk-CVE-2024-11614.patch
+- Move docs from %{_docdir}/dpdk/dpdk to %{docdir}/dpdk
+
+-------------------------------------------------------------------
+Mon Feb 17 07:38:12 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to LTS version 24.11
+  * Changelog: https://doc.dpdk.org/guides/rel_notes/release_24_11.html
+  * This update fix build with glibc 2.41
+- Use gcc14 on x86_64 SLE15/16 to avoid the inline error
+
+-------------------------------------------------------------------
+Wed Jan  1 13:12:20 UTC 2025 - Duraisankar P <Duraisankar.pitchumani@suse.com>
+
+-  Fix CVE-2024-11614 [bsc#1234718] - Denial Of Service from malicious guest on hypervisors using DPDK Vhost library
+-  Added patch,
+     + dpdk-CVE-2024-11614.patch 
+
+-------------------------------------------------------------------
+Sat Sep 14 12:34:14 UTC 2024 - Dan Partelly <d.partelly@yahoo.com>
+
+- Enable (disabled by default) installation of headers needed
+  to build drivers.
+
+-------------------------------------------------------------------
+Fri Sep 13 05:08:15 UTC 2024 - Duraisankar P <Duraisankar.pitchumani@suse.com>
+
+- Use python macros from build config
+
 -------------------------------------------------------------------
 Thu Sep  5 11:40:32 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
@@ -279,9 +341,9 @@ Mon Sep  2 06:15:32 UTC 2024 - Duraisankar P <Duraisankar.pitchumani@suse.com>
     * 0002-SLE15-SP3-compatibility-patch-for-kni.patch
     * kni-fix-build-with-Linux-6.10.patch
     * kni-fix-build-with-Linux-6.8.patch
-    * preamble 
+    * preamble
 - Updated the below patch for DPDK v23.11
-    * 0001-fix-cpu-compatibility.patch 
+    * 0001-fix-cpu-compatibility.patch
 
 -------------------------------------------------------------------
 Thu Aug 22 17:33:47 UTC 2024 - Aeneas Jaißle <aj@ajaissle.de>
@@ -409,7 +471,7 @@ Wed Apr  5 21:10:54 UTC 2023 - Duraisankar P <Duraisankar.pitchumani@suse.com>
     * Added Patches:
         0001-fix-cpu-compatibility.patch
     * Rebased patches:
-        0002-SLE15-SP3-compatibility-patch-for-kni.patch 
+        0002-SLE15-SP3-compatibility-patch-for-kni.patch
 
 -------------------------------------------------------------------
 Wed Feb 22 08:58:07 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
@@ -420,7 +482,7 @@ Wed Feb 22 08:58:07 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
 Tue Jun 21 13:20:00 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
 - also strip meson generated runpaths when installing examples
-  manually (bsc#1200620) 
+  manually (bsc#1200620)
 
 -------------------------------------------------------------------
 Wed May 25 10:13:44 UTC 2022 - Jiri Slaby <jslaby@suse.cz>
@@ -673,7 +735,7 @@ Mon Oct 25 13:41:49 UTC 2021 - Stefan Weiberg <sweiberg@suse.com>
   0001-SLE15-SP3-compatibility-patch-for-kni.patch
   to
   0002-SLE15-SP3-compatibility-patch-for-kni.patch
-- rename 
+- rename
   dpdk-fallthrough-comment-fixes.patch
   to
   0003-dpdk-fallthrough-comment-fixes.patch
@@ -748,7 +810,7 @@ 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 
+- 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
@@ -1164,7 +1226,7 @@ Tue May 19 11:41:34 UTC 2020 - Jaime Caamaño Ruiz <jcaamano@suse.com>
 Wed Apr 29 11:45:24 UTC 2020 - Jaime Caamaño Ruiz <jcaamano@suse.com>
 
 - Update to v19.11.1. For a list of changes, check:
-  * https://doc.dpdk.org/guides/rel_notes/release_19_11.html#new-features 
+  * https://doc.dpdk.org/guides/rel_notes/release_19_11.html#new-features
 - Removed patches no longer applying to the code base:
   * 0001-vhost-fix-possible-denial-of-service-on-SET_VRING_NU.patch
   * 0002-vhost-fix-possible-denial-of-service-by-leaking-FDs.patch
@@ -1194,7 +1256,7 @@ Tue Nov 19 15:45:29 UTC 2019 - Jaime Caamaño Ruiz <jcaamano@suse.com>
 -------------------------------------------------------------------
 Mon Sep 30 10:04:59 UTC 2019 -  <jcaamano@suse.com>
 
-- Changed to multibuild (bsc#1151455). 
+- Changed to multibuild (bsc#1151455).
 - Added dpdk-fix-implicit-fallthrough-warning.patch to address build error with
   recent kernels (bsc#1144704).
 
@@ -1504,11 +1566,11 @@ Mon Sep  4 11:18:19 CEST 2017 - ndas@suse.de
      http://dpdk.org/doc/guides/rel_notes/release_17_08.html
      http://dpdk.org/doc/guides/rel_notes/release_17_05.html
      http://dpdk.org/doc/guides/rel_notes/release_17_02.html
-    [-0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch                                                                                                                                            
-    -0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch                                                                                                                                       
-    -0004-net-thunderx-sync-mailbox-definitions-with-Linux-PF-.patch                                                                                                                                   
-    -0005-kni-fix-build-with-gcc-7.1.patch                                                                                                                                                             
-    -0006-kni-fix-ethtool-build-with-kernel-4.11.patch                                                                                                                                                 
+    [-0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch
+    -0003-kni-define-HAVE_TRANS_START_HELPER-for-SLES12SP3.patch
+    -0004-net-thunderx-sync-mailbox-definitions-with-Linux-PF-.patch
+    -0005-kni-fix-build-with-gcc-7.1.patch
+    -0006-kni-fix-ethtool-build-with-kernel-4.11.patch
     -0007-igb_uio-switch-to-new-irq-function-for-MSI-X.patch]
 - Use updated patch to enable HAVE_TRANS_START_HELPER for SLE12SP3(bsc#1031705).
   [+ 0002-kni-fix-build-on-SLE12-SP3.patch]
@@ -1578,7 +1640,7 @@ Wed Jun 14 12:55:10 CEST 2017 - ndas@suse.de
    * net/ixgbe: fix Rx queue blocking issue
    * net/ixgbe: fix all queues drop setting of DCB
    * net/ixgbe: fix TC bandwidth setting
-   more details can be found in 
+   more details can be found in
    http://dpdk.org/ml/archives/stable/2017-May/001809.html
    [- 0005-kni-fix-build-with-kernel-4.11.patch]
 - use default gcc which is now gcc7 (bsc#1042372)
@@ -1738,7 +1800,7 @@ Fri Feb 24 13:46:44 CET 2017 - ndas@suse.de
 Thu Feb 16 18:29:43 CET 2017 - ndas@suse.de
 
 - Do not disable cryptodev as EXPREMENTAL tag has been removed.
-- Remove CONFIG_RTE_LIBRTE_MBUF_OFFLOAD as cryptodev is not depending 
+- Remove CONFIG_RTE_LIBRTE_MBUF_OFFLOAD as cryptodev is not depending
   on it anymore and its removed from the upstream.
 
 -------------------------------------------------------------------
@@ -1962,9 +2024,9 @@ Thu Jul 28 16:39:07 CEST 2016 - ndas@suse.de
 -------------------------------------------------------------------
 Mon Jul 11 18:20:57 CEST 2016 - ndas@suse.de
 
-- Added support for aarch64 compilation. 
+- Added support for aarch64 compilation.
   [+0035-PAGE_SIZE-constant-is-not-defined-on-ARM-since-multi.patch]
-- Disabled aarch64 dpdk-examples package for the time being as it 
+- Disabled aarch64 dpdk-examples package for the time being as it
   contains lots of Intel specific code.
 - Added proper "Group" field for the subpackages .
 
@@ -1984,7 +2046,7 @@ Thu Jun 23 09:56:05 UTC 2016 - mchandras@suse.de
 -------------------------------------------------------------------
 Tue Jun 14 10:04:09 UTC 2016 - ndas@suse.de
 
-- Removed unwanted files(bsc#984437). 
+- Removed unwanted files(bsc#984437).
 
 -------------------------------------------------------------------
 Thu Jun  9 17:18:01 CEST 2016 -  ndas@suse.de
@@ -1999,7 +2061,7 @@ Wed Jun  1 14:16:10 UTC 2016 - mchandras@suse.de
 -------------------------------------------------------------------
 Fri May 27 12:28:02 CEST 2016 - ndas@suse.de
 
-- Applied all the fixes recommended by upstream for 
+- Applied all the fixes recommended by upstream for
   v2.2 stable release(bsc#981996).
 
 	[+0008-app-testpmd-handle-SIGINT-and-SIGTERM.patch,
@@ -2050,7 +2112,7 @@ Wed Apr 27 14:55:37 UTC 2016 - mchandras@suse.de
 -------------------------------------------------------------------
 Tue Apr 19 10:45:29 CEST 2016 - ndas@suse.de
 
-- DPDK is most common vhost-user backend, Adding upstream patches to 
+- DPDK is most common vhost-user backend, Adding upstream patches to
   help qemu vm live migration with vhost-user (fate#320713).
   [+ 0004-54f9e32-vhost-handle-dirty-pages-logging-request.patch
    + 0005-d293dac-vhost-claim-support-of-guest-announce.patch
@@ -2087,11 +2149,11 @@ Mon Apr 11 16:12:09 CEST 2016 - ndas@suse.de
    - dpdk-2.2-warningflags.patch,
    + 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch
    + 0002-examples-ip_pipeline-fix-implicit-declaration-of-fun.patch]
-- Added CONFIG_RTE_BUILD_COMBINE_LIBS flags to club all all *.so into 
+- Added CONFIG_RTE_BUILD_COMBINE_LIBS flags to club all all *.so into
   one library
 
 -------------------------------------------------------------------
 Mon Mar 21 14:15:08 UTC 2016 - nirmoy.das@suse.com
 
-- Intial version 2.2.0(fate#319169) 
+- Intial version 2.2.0(fate#319169)
 

dpdk.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dpdk
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,35 +17,28 @@
 # needssslcertforbuild
 
 
-%define flavor @BUILD_FLAVOR@%{nil}
-%define aarch64_machine armv8-a
-%define exclusive_arch aarch64 x86_64 ppc64le
-%define name_tag %{nil}
-%define summary_tag %{nil}
-%if "%{flavor}" == "thunderx"
-%define name_tag -thunderx
-%define summary_tag (thunderx)
-%define exclusive_arch aarch64
-%endif
-# http://doc.dpdk.org/guides-22.11/linux_gsg/build_dpdk.html#adjusting-build-options
 %define platform generic
 %define machine  auto
-%ifarch aarch64
-%define machine %{aarch64_machine}
-%endif
 # This is in sync with <src>/ABI_VERSION
 # TODO: automate this sync
-%define maj 24
+%define maj 25
 %define min 0
 #%%define lname libdpdk-%%{maj}_%%{min}
 %define lname libdpdk-%{maj}
+#
+%if 0%{?sle_version} >= 150600
+%global pprefix python311
+%{?sle15_python_module_pythons}
+%else
+%global pythons python3
+%global pprefix python3
+%endif
 # Add option to build without examples
 %bcond_without examples
 # Add option to build without tools
 %bcond_without tools
-#
-Name:           dpdk%{name_tag}
-Version:        23.11.1
+Name:           dpdk
+Version:        24.11.1
 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
@@ -56,6 +49,13 @@ Source:         https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
 Patch0:         0001-fix-cpu-compatibility.patch
 # PATCH-FIX-UPSTREAM - https://bugs.dpdk.org/show_bug.cgi?id=1530
 Patch1:         0001-examples-vm_power_manager-add-missing-header.patch
+# Fix inline error for < gcc14 (<=SLE16)
+Patch2:         0001-always_inline-fix.patch
+# Fix reproducable builds https://bugzilla.opensuse.org/show_bug.cgi?id=1244130
+Patch3:         0001-dts-generate-random-capture_name-per-call.patch
+BuildRequires:  %{python_module Sphinx}
+BuildRequires:  %{python_module pyelftools >= 0.22}
+BuildRequires:  %{pythons}
 BuildRequires:  binutils
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -66,9 +66,6 @@ BuildRequires:  modutils
 BuildRequires:  patchelf
 BuildRequires:  pesign-obs-integration
 BuildRequires:  pkgconfig
-BuildRequires:  python3
-BuildRequires:  python3-Sphinx
-BuildRequires:  python3-pyelftools >= 0.22
 BuildRequires:  rdma-core-devel
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(libcrypto)
@@ -77,10 +74,12 @@ BuildRequires:  pkgconfig(libmnl)
 BuildRequires:  pkgconfig(libpcap)
 BuildRequires:  pkgconfig(numa)
 BuildRequires:  pkgconfig(zlib)
-Conflicts:      dpdk-any
-Provides:       dpdk-any = %{version}
 Obsoletes:      dpdk-kmp-trace < %{version}
-ExclusiveArch:  %{exclusive_arch}
+%ifarch aarch64
+Provides:       dpdk-thunderx = %{version}-%{release}
+Obsoletes:      dpdk-thunderx < %{version}-%{release}
+%endif
+ExclusiveArch:  aarch64 x86_64 ppc64le
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
 # https://bugzilla.opensuse.org/show_bug.cgi?id=1196511
 BuildRequires:  pkgconfig(libbpf)
@@ -91,27 +90,33 @@ The Data Plane Development Kit is a set of libraries and drivers for
 fast packet processing in the user space.
 
 %package devel
-Summary:        Data Plane Development Kit development files %{summary_tag}
+Summary:        Data Plane Development Kit development files
 Group:          Development/Libraries/C and C++
 Requires:       %{lname} = %{version}
-Conflicts:      dpdk-any-devel
-Provides:       dpdk-any-devel = %{version}
+%ifarch aarch64
+Provides:       dpdk-thunderx-devel = %{version}-%{release}
+Obsoletes:      dpdk-thunderx-devel < %{version}-%{release}
+%endif
 
 %description devel
 This package contains the headers and other files needed for developing
 applications with the Data Plane Development Kit.
 
 %package devel-static
-Summary:        Data Plane Development Kit static development files %{summary_tag}
+Summary:        Data Plane Development Kit static development files
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
+%ifarch aarch64
+Provides:       dpdk-thunderx-devel-static = %{version}-%{release}
+Obsoletes:      dpdk-thunderx-devel-static < %{version}-%{release}
+%endif
 
 %description devel-static
 This package contains the static library files needed for developing
 applications with the Data Plane Development Kit.
 
 %package -n %{lname}
-Summary:        Data Plane Development Kit runtime libraries %{summary_tag}
+Summary:        Data Plane Development Kit runtime libraries
 Group:          Development/Libraries/C and C++
 Provides:       %{lname}-any = %{version}
 
@@ -120,26 +125,30 @@ This package contains the runtime libraries needed for 3rd party application
 to use the Data Plane Development Kit.
 
 %package doc
-Summary:        Data Plane Development Kit API documentation %{summary_tag}
+Summary:        Data Plane Development Kit API documentation
 Group:          System/Libraries
-Conflicts:      dpdk-any-doc
-Provides:       dpdk-any-doc = %{version}
 BuildArch:      noarch
+%ifarch aarch64
+Provides:       dpdk-thunderx-doc = %{version}-%{release}
+Obsoletes:      dpdk-thunderx-doc < %{version}-%{release}
+%endif
 
 %description doc
 API programming documentation for the Data Plane Development Kit.
 
 %if %{with tools}
 %package tools
-Summary:        Tools for setting up Data Plane Development Kit environment %{summary_tag}
+Summary:        Tools for setting up Data Plane Development Kit environment
 Group:          System/Libraries
 Requires:       %{name} = %{version}
 Requires:       findutils
 Requires:       iproute
 Requires:       kmod
 Requires:       pciutils
-Conflicts:      dpdk-any-tools
-Provides:       dpdk-any-tools = %{version}
+%ifarch aarch64
+Provides:       dpdk-thunderx-tools = %{version}-%{release}
+Obsoletes:      dpdk-thunderx-tools < %{version}-%{release}
+%endif
 
 %description tools
 This package contains tools for setting up Data Plane Development Kit environment
@@ -147,11 +156,13 @@ This package contains tools for setting up Data Plane Development Kit environmen
 
 %if %{with examples}
 %package examples
-Summary:        Data Plane Development Kit example applications %{summary_tag}
+Summary:        Data Plane Development Kit example applications
 Group:          System/Libraries
 BuildRequires:  libvirt-devel
-Conflicts:      dpdk-any-examples
-Provides:       dpdk-any-examples = %{version}
+%ifarch aarch64
+Provides:       dpdk-thunderx-examples = %{version}-%{release}
+Obsoletes:      dpdk-thunderx-examples < %{version}-%{release}
+%endif
 
 %description examples
 Example applications utilizing the Data Plane Development Kit, such
@@ -164,14 +175,8 @@ as L2 and L3 forwarding.
 %define pmddir %{_libdir}/dpdk-pmds-%{maj}.%{min}
 
 %prep
-# can't use %%{name} because of dpdk-thunderx
-%setup -n dpdk-stable-%{version}
-%if 0%{?suse_version} > 1600
+%setup -q -n dpdk-stable-%{version}
 %autopatch -p1
-%else
-# grr, no fs.copyfile() in the old meson in SLE (but it has old enough kernel).
-%autopatch -p1 -M 99
-%endif
 
 # Skip not supported examples
 sed -i "/performance-thread/d" examples/meson.build
@@ -197,6 +202,7 @@ for flavor in %{flavors_to_build}; do
     -Dplatform="%{platform}" \
     -Dcpu_instruction_set=%{machine} \
     -Denable_kmods=true \
+    -Denable_driver_sdk=true \
     -Ddrivers_install_subdir=%{pmddir} \
     -Dkernel_dir="%{_prefix}/src/linux-obj/%{_target_cpu}/$flavor"
   %meson_build
@@ -222,9 +228,14 @@ for flavor in %{flavors_to_build}; do
 done
 
 # Fix documentation
-mkdir -p %{buildroot}%docdir
-mv %{buildroot}%{_datadir}/doc/dpdk %{buildroot}%docdir
-rm -r %{buildroot}/%docdir/dpdk/html/.doctrees
+mkdir -p %{buildroot}%{docdir}
+mv %{buildroot}%{_datadir}/doc/dpdk %{buildroot}%{_docdir}
+rm -rf %{buildroot}%{docdir}/html/.doctrees
+rm -rf %{buildroot}%{docdir}/html/dts/.doctrees
+rm %{buildroot}%{docdir}/html/.buildinfo
+rm %{buildroot}%{docdir}/html/dts/.buildinfo
+rm %{buildroot}%{docdir}/html/dts/.html.d
+
 # Fix man directory
 rm -r %{buildroot}%{_mandir}/man3/*