diff --git a/.dpdk.metadata b/.dpdk.metadata index b28b797..c1bc26b 100644 --- a/.dpdk.metadata +++ b/.dpdk.metadata @@ -1,2 +1,2 @@ -a8f700e3a4e2f4657a9d05bfdccce5789a5c5f35 SOURCES/dpdk-21.11.1.tar.xz +920fad3e24b62e92d9f8c5192ceed74fbb2e1c5a SOURCES/dpdk-22.11.tar.xz 3cc45b133677fbff08e89e65a2120be52ebb27a5 SOURCES/pyelftools-0.27.tar.gz diff --git a/.gitignore b/.gitignore index 86f5947..878be45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/dpdk-21.11.1.tar.xz +SOURCES/dpdk-22.11.tar.xz SOURCES/pyelftools-0.27.tar.gz diff --git a/SPECS/dpdk.spec b/SPECS/dpdk.spec index 4a40693..6ad3fc4 100644 --- a/SPECS/dpdk.spec +++ b/SPECS/dpdk.spec @@ -8,7 +8,7 @@ #% define date 20191128 #% define shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%define ver 21.11.1 +%define ver 22.11 %define rel 1 %define srcname dpdk%(awk -F. '{ if (NF > 2) print "-stable" }' <<<%{version}) @@ -31,9 +31,6 @@ Source: http://fast.dpdk.org/rel/dpdk-%{ver}.tar.xz # Only needed for creating snapshot tarballs, not used in build itself Source100: dpdk-snapshot.sh -# Patches only in dpdk package - - Summary: Set of libraries and drivers for fast packet processing # @@ -126,6 +123,14 @@ as L2 and L3 forwarding. export PYTHONPATH=$(pwd)/pyelftools-%{pyelftoolsver} %endif +ENABLED_APPS=( + test-pmd +) + +for app in "${ENABLED_APPS[@]}"; do + enable_apps="${enable_apps:+$enable_apps,}"$app +done + ENABLED_DRIVERS=( bus/pci bus/vdev @@ -164,13 +169,15 @@ ENABLED_DRIVERS+=( ) %endif -for driver in ${ENABLED_DRIVERS[@]}; do +for driver in "${ENABLED_DRIVERS[@]}"; do enable_drivers="${enable_drivers:+$enable_drivers,}"$driver done -# As of 21.11-rc3, following libraries can be disabled: +# As of 22.11, following libraries can be disabled: # optional_libs = [ # 'bitratestats', +# 'cfgfile', +# 'flow_classify', # 'gpudev', # 'gro', # 'gso', @@ -178,17 +185,27 @@ done # '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 DISABLED_LIBS=( + cfgfile + flow_classify gpudev kni jobstats + node + pipeline + port power + table ) for lib in "${DISABLED_LIBS[@]}"; do @@ -199,6 +216,7 @@ done --default-library=shared \ -Ddisable_libs="$disable_libs" \ -Ddrivers_install_subdir=dpdk-pmds \ + -Denable_apps="$enable_apps" \ -Denable_docs=true \ -Denable_drivers="$enable_drivers" \ -Dplatform=generic \ @@ -208,14 +226,14 @@ done # Check drivers and libraries for driver in "${ENABLED_DRIVERS[@]}"; do - config_token=RTE_$(echo $driver | tr [a-z/] [A-Z_]) - ! grep -q $config_token */rte_build_config.h || continue + config_token="RTE_$(echo "$driver" | tr [a-z/] [A-Z_])" + ! grep -Fqw "$config_token" */rte_build_config.h || continue echo "!!! Could not find $driver in rte_build_config.h, please check dependencies. !!!" false done for lib in "${DISABLED_LIBS[@]}"; do - config_token=RTE_LIB_$(echo $lib | tr [a-z/] [A-Z_]) - grep -q $config_token */rte_build_config.h || continue + config_token="RTE_LIB_$(echo "$lib" | tr [a-z/] [A-Z_])" + grep -Fqw "$config_token" */rte_build_config.h || continue echo "!!! Found $lib in rte_build_config.h. !!!" false done @@ -224,12 +242,8 @@ done %install %meson_install -rm -f %{buildroot}%{_bindir}/dpdk-dumpcap -rm -f %{buildroot}%{_bindir}/dpdk-pdump -rm -f %{buildroot}%{_bindir}/dpdk-proc-info -rm -f %{buildroot}%{_bindir}/dpdk-test{,-acl,-bbdev,-cmdline,-compress-perf,-crypto-perf,-eventdev,-pipeline,-sad,-fib,-flow-perf,-regex} rm -f %{buildroot}%{_libdir}/*.a -# Taked from debian/rules +# Taken from debian/rules rm -f %{docdir}/html/.buildinfo rm -f %{docdir}/html/objects.inv rm -rf %{docdir}/html/.doctrees @@ -274,6 +288,13 @@ rm -rf %{docdir}/html/.doctrees %endif %changelog +* Mon Jan 23 2023 Timothy Redaelli - 22.11-1 +- Rebase to 22.11 (#2129066) + +* Mon Sep 12 2022 Timothy Redaelli - 21.11.2-1 +- Rebase to 21.11.2 (#2126159) +- Includes fixes for CVE-2022-2132 (#2107173) and CVE-2022-28199 (#2123616) + * Wed Jul 13 2022 Timothy Redaelli - 21.11.1-1 - Rebase to 21.11.1 (#2106856) - Includes fix for CVE-2021-3839 (#2026642)