Compare commits

..

No commits in common. "imports/c9-beta/dpdk-22.11-1.el9" and "c8" have entirely different histories.

3 changed files with 51 additions and 59 deletions

View File

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

2
.gitignore vendored
View File

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

View File

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