.dpdk.metadata

@@ -1,2 +1,2 @@
-061198752d3d8b64d33113b7c8c1e272c973403d SOURCES/dpdk-23.11.tar.xz
+920fad3e24b62e92d9f8c5192ceed74fbb2e1c5a SOURCES/dpdk-22.11.tar.xz
 3cc45b133677fbff08e89e65a2120be52ebb27a5 SOURCES/pyelftools-0.27.tar.gz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/dpdk-23.11.tar.xz
+SOURCES/dpdk-22.11.tar.xz
 SOURCES/pyelftools-0.27.tar.gz

SPECS/dpdk.spec

@@ -8,7 +8,7 @@
 #% define date 20191128
 #% define shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-%define ver 23.11
+%define ver 22.11
 %define rel 1
 
 %define srcname dpdk%(awk -F. '{ if (NF > 2) print "-stable" }' <<<%{version})
@@ -23,9 +23,9 @@ Epoch: 2
 %endif
 URL: http://dpdk.org
 %if 0%{?commit0:1}
-Source: https://dpdk.org/browse/dpdk/snapshot/dpdk-%{commit0}.tar.xz
+Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{commit0}.tar.xz
 %else
-Source: https://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz
+Source: http://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz
 %endif
 
 # Only needed for creating snapshot tarballs, not used in build itself
@@ -62,7 +62,7 @@ Source1: https://github.com/eliben/pyelftools/archive/refs/tags/v%{pyelftoolsver
 %if 0%{?rhel} > 8 || 0%{?fedora}
 BuildRequires: python3-pyelftools
 %endif
-BuildRequires: gcc, zlib-devel, numactl-devel, libarchive-devel
+BuildRequires: gcc, zlib-devel, numactl-devel
 BuildRequires: doxygen, python3-sphinx
 %ifarch x86_64
 BuildRequires: rdma-core-devel >= 15
@@ -125,7 +125,6 @@ export PYTHONPATH=$(pwd)/pyelftools-%{pyelftoolsver}
 
 ENABLED_APPS=(
     test-pmd
-    test-bbdev
 )
 
 for app in "${ENABLED_APPS[@]}"; do
@@ -146,16 +145,15 @@ ENABLED_DRIVERS=(
 
 %ifarch x86_64
 ENABLED_DRIVERS+=(
-    baseband/acc
     bus/auxiliary
     bus/vmbus
     common/iavf
     common/mlx5
-    common/nfp
     net/bnxt
     net/enic
     net/iavf
     net/ice
+    net/mlx4
     net/mlx5
     net/netvsc
     net/nfp
@@ -175,40 +173,48 @@ for driver in "${ENABLED_DRIVERS[@]}"; do
     enable_drivers="${enable_drivers:+$enable_drivers,}"$driver
 done
 
+# As of 22.11, following libraries can be disabled:
+# optional_libs = [
+#         'bitratestats',
+#         'cfgfile',
+#         'flow_classify',
+#         'gpudev',
+#         'gro',
+#         'gso',
+#         'kni',
+#         'jobstats',
+#         'latencystats',
+#         'metrics',
+#         'node',
+#         'pdump',
+#         'pipeline',
+#         'port',
+#         'power',
+#         'table',
+#         'vhost',
+# ]
 # If doing any updates, this must be aligned with:
 # https://access.redhat.com/articles/3538141
-ENABLED_LIBS=(
+DISABLED_LIBS=(
-    bbdev
+    cfgfile
-    bitratestats
+    flow_classify
-    bpf
+    gpudev
-    cmdline
+    kni
-    cryptodev
+    jobstats
-    dmadev
+    node
-    gro
+    pipeline
-    gso
+    port
-    hash
+    power
-    ip_frag
+    table
-    latencystats
-    member
-    meter
-    metrics
-    pcapng
-    pdump
-    security
-    stack
-    vhost
 )
 
-for lib in "${ENABLED_LIBS[@]}"; do
+for lib in "${DISABLED_LIBS[@]}"; do
-    enable_libs="${enable_libs:+$enable_libs,}"$lib
+    disable_libs="${disable_libs:+$disable_libs,}"$lib
 done
 
-ln -s /usr/bin/true mandb
-export PATH=$(pwd):$PATH
 %meson --includedir=include/dpdk \
        --default-library=shared \
-       -Ddeveloper_mode=disabled \
+       -Ddisable_libs="$disable_libs" \
-       -Denable_libs="$enable_libs" \
        -Ddrivers_install_subdir=dpdk-pmds \
        -Denable_apps="$enable_apps" \
        -Denable_docs=true \
@@ -225,10 +231,10 @@ for driver in "${ENABLED_DRIVERS[@]}"; do
 	echo "!!! Could not find $driver in rte_build_config.h, please check dependencies. !!!"
 	false
 done
-for lib in "${ENABLED_LIBS[@]}"; do
+for lib in "${DISABLED_LIBS[@]}"; do
 	config_token="RTE_LIB_$(echo "$lib" | tr [a-z/] [A-Z_])"
-	! grep -Fqw "$config_token" */rte_build_config.h || continue
+	grep -Fqw "$config_token" */rte_build_config.h || continue
-	echo "!!! Could not find $lib in rte_build_config.h, please check dependencies. !!!"
+	echo "!!! Found $lib in rte_build_config.h. !!!"
 	false
 done
 %meson_build
@@ -238,16 +244,14 @@ done
 
 rm -f %{buildroot}%{_libdir}/*.a
 # Taken from debian/rules
-rm -f %{buildroot}%{docdir}/html/.buildinfo
+rm -f %{docdir}/html/.buildinfo
-rm -f %{buildroot}%{docdir}/html/objects.inv
+rm -f %{docdir}/html/objects.inv
-rm -rf %{buildroot}%{docdir}/html/.doctrees
+rm -rf %{docdir}/html/.doctrees
-find %{buildroot}%{_datadir}/man/ -type f -a ! -iname "*rte_*" -exec rm {} \;
 
 %files
 # BSD
 %doc README MAINTAINERS
 %{_bindir}/dpdk-testpmd
-%{_bindir}/dpdk-test-bbdev
 %dir %{pmddir}
 %{_libdir}/*.so.*
 %{pmddir}/*.so.*
@@ -272,7 +276,6 @@ find %{buildroot}%{_datadir}/man/ -type f -a ! -iname "*rte_*" -exec rm {} \;
 %{pmddir}/*.so
 %{_libdir}/pkgconfig/libdpdk.pc
 %{_libdir}/pkgconfig/libdpdk-libs.pc
-%{_datadir}/man
 %if %{with examples}
 %files examples
 %{_bindir}/dpdk-*
@@ -285,17 +288,22 @@ find %{buildroot}%{_datadir}/man/ -type f -a ! -iname "*rte_*" -exec rm {} \;
 %endif
 
 %changelog
-* Fri Dec 15 2023 David Marchand <david.marchand@redhat.com> - 23.11-1
+* Mon Jan 23 2023 Timothy Redaelli <tredaelli@redhat.com> - 22.11-1
-- Rebase to 23.11 (RHEL-19584)
+- Rebase to 22.11 (#2129066)
 
-* Fri Dec 23 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11-3
+* Mon Sep 12 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11.2-1
-- Version bump just to be sure it's updated from dpdk-21.11-2.el8_7
+- Rebase to 21.11.2 (#2126159)
+- Includes fixes for CVE-2022-2132 (#2107173) and CVE-2022-28199 (#2123616)
 
-* Wed Oct 26 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11-2
+* Wed Jul 13 2022 Timothy Redaelli <tredaelli@redhat.com> - 21.11.1-1
-- Backport fixes for CVE-2022-2132 (#2107171)
+- Rebase to 21.11.1 (#2106856)
+- Includes fix for CVE-2021-3839 (#2026642)
 
 * Tue Nov 23 2021 David Marchand <david.marchand@redhat.com> - 21.11-1
-- Rebase to 21.11 (#2029497)
+- Rebase to 21.11 (#2030616)
+
+* Fri Nov 19 2021 Timothy Redaelli <tredaelli@redhat.com> - 20.11.1-1
+- Rebase to 20.11.1 (#2024994)
 
 * Tue Feb 16 2021 Timothy Redaelli <tredaelli@redhat.com> - 20.11-3
 - Fix gating since on DPDK 20.11 testpmd is called dpdk-testpmd