Accepting request 974303 from network

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

0001-build-try-to-get-kernel-version-from-kernel-source.patch

@@ -15,14 +15,13 @@ Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
  1 file changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
-index d8fb20c1c3..78f28ffb0c 100644
---- a/kernel/linux/meson.build
-+++ b/kernel/linux/meson.build
+--- dpdk-stable-21.11.1/kernel/linux/meson.build	2022-04-26 12:21:45.000000000 +0200
++++ mew/kernel/linux/meson.build	2022-04-27 18:17:06.676254482 +0200
 @@ -11,7 +11,17 @@
-
+ 
  if not meson.is_cross_build()
      # native build
--    kernel_version = run_command('uname', '-r').stdout().strip()
+-    kernel_version = run_command('uname', '-r', check: true).stdout().strip()
 +    kernel_version = ''
 +    if kernel_source_dir != ''
 +        # Try kernel makefile first
@@ -37,6 +36,3 @@ index d8fb20c1c3..78f28ffb0c 100644
      kernel_install_dir = '/lib/modules/' + kernel_version + '/extra/dpdk'
      if kernel_build_dir == ''
          # use default path for native builds
--- 
-2.35.1
-

dpdk-21.11.1.tar.xz

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

dpdk-21.11.tar.xz

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

dpdk.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Apr 27 16:08:56 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 21.11.1
+  * acl: add missing C++ guards
+  * app/compress-perf: Various bug fixes
+  * app/dumpcap: check for failure to set promiscuous
+  * app/fib: fix division by zero
+  * app/pdump: abort on multi-core capture limit
+  * app/regex: fix number of matches
+  * app/testpmd: Various bug fixes
+  * baseband/acc100: avoid out-of-bounds access
+  * bpf: add missing C++ guards
+  * bus/pci: assign driver pointer before mapping
+  * common/cnxk: Various bug fixes
+  * common/mlx5: Various bug fixes
+  * common/sfc_efx/base: fix recirculation ID set in outer rules
+  * compressdev: fix missing space in log macro
+  * eal/linux:
+    * fix device monitor stop return
+    * fix illegal memory access in uevent handler
+    * log hugepage create errors with filename
+  * Full change log can be found online:
+    http://doc.dpdk.org/guides-21.11/rel_notes/release_21_11.html#fixes
+- Rebased 0001-build-try-to-get-kernel-version-from-kernel-source.patch
+- Dropped upstream fixed fix-buildsystem-python36.patch
+
 -------------------------------------------------------------------
 Sat Feb 26 17:45:33 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 

dpdk.spec

@@ -48,7 +48,7 @@
 %bcond_without tools
 #
 Name:           dpdk%{name_tag}
-Version:        21.11
+Version:        21.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
@@ -59,8 +59,6 @@ Source1:        preamble
 # PATCH-FIX-OPENSUSE PATCH-FEATURE-UPSTREAM
 Patch0:         0001-build-try-to-get-kernel-version-from-kernel-source.patch
 Patch1:         0002-SLE15-SP3-compatibility-patch-for-kni.patch
-# PATCH-FIX-OPENSUSE fix-buildsystem-python36.patch -- Fix building with python36
-Patch2:         fix-buildsystem-python36.patch
 BuildRequires:  binutils
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -179,7 +177,7 @@ The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the
 
 %prep
 # can't use %%{name} because of dpdk-thunderx
-%autosetup -p1 -n dpdk-%{version}
+%autosetup -p1 -n dpdk-stable-%{version}
 
 # Skip not supported examples
 sed -i "/performance-thread/d" examples/meson.build

fix-buildsystem-python36.patch

@@ -1,12 +0,0 @@
-diff -Nur dpdk-21.11/buildtools/binutils-avx512-check.py new/buildtools/binutils-avx512-check.py
---- dpdk-21.11/buildtools/binutils-avx512-check.py	2021-11-26 18:58:21.000000000 +0100
-+++ new/buildtools/binutils-avx512-check.py	2022-02-26 18:44:13.325608971 +0100
-@@ -15,7 +15,7 @@
-     src = '__asm__("vpgatherqq {}");'.format(gather_params).encode('utf-8')
-     subprocess.run(cc + ['-c', '-xc', '-o', obj.name, '-'], input=src, check=True)
-     asm = subprocess.run([objdump, '-d', '--no-show-raw-insn', obj.name],
--                         capture_output=True, check=True).stdout.decode('utf-8')
-+                         stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True).stdout.decode('utf-8')
-     if gather_params not in asm:
- 	    print('vpgatherqq displacement error with as')
- 	    sys.exit(1)