diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index cf7e269..6349d48 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -56,8 +56,8 @@ Name: %{pkgname} Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ -Version: 3.4.0 -Release: 48%{?dist} +Version: 3.4.1 +Release: 52%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -75,10 +75,11 @@ License: ASL 2.0 and LGPLv2+ and SISSL %define dpdkarches %endif +%define ovsver 3.4.0 %if 0%{?commit:1} Source: https://github.com/openvswitch/ovs/archive/%{commit}.tar.gz#/openvswitch-%{commit}.tar.gz %else -Source: https://github.com/openvswitch/ovs/archive/v%{version}.tar.gz#/openvswitch-%{version}.tar.gz +Source: https://github.com/openvswitch/ovs/archive/v%{ovsver}.tar.gz#/openvswitch-%{ovsver}.tar.gz %endif Source2: openvswitch.sysusers Source3: openvswitch-hugetlbfs.sysusers @@ -93,11 +94,7 @@ Source101: https://pypi.io/packages/source/P/Pygments/Pygments-%{pygmentsver}.ta Source102: https://pypi.io/packages/source/S/Sphinx/Sphinx-%{sphinxver}.tar.gz Source103: https://pypi.io/packages/source/p/pyelftools/pyelftools-%{pyelftoolsver}.tar.gz -%define apply_patch %(test -s %{_sourcedir}/openvswitch-%{version}.patch && echo 1 || echo 0) - -%if %{apply_patch} -Patch0: openvswitch-%{version}.patch -%endif +Patch0: openvswitch-%{ovsver}.patch # The DPDK is designed to optimize througput of network traffic using, among # other techniques, carefully crafted assembly instructions. As such it @@ -255,26 +252,26 @@ This package provides IPsec tunneling support for OVS tunnels. %if 0%{?commit:1} %setup -q -n ovs-%{commit} -a 10 %else -%setup -q -n ovs-%{version} -a 10 +%setup -q -n ovs-%{ovsver} -a 10 %endif %if ! %{external_sphinx} %if 0%{?commit:1} %setup -n ovs-%{commit} -q -D -T -a 100 -a 101 -a 102 %else -%setup -n ovs-%{version} -q -D -T -a 100 -a 101 -a 102 +%setup -n ovs-%{ovsver} -q -D -T -a 100 -a 101 -a 102 %endif %endif %if 0%{?rhel} && 0%{?rhel} < 9 %if 0%{?commit:1} %setup -n ovs-%{commit} -q -D -T -a 103 %else -%setup -n ovs-%{version} -q -D -T -a 103 +%setup -n ovs-%{ovsver} -q -D -T -a 103 %endif %endif mv dpdk-*/ %{dpdkdir}/ -%if %{apply_patch} +%if 0%{?PATCH0:1}%{!?PATCH0:0} %patch -P0 -p1 %endif @@ -296,7 +293,7 @@ export PATH="$PATH:%{_builddir}/pytmp/bin" ./boot.sh -%ifarch %{dpdkarches} # build dpdk +%ifarch %{dpdkarches} # Lets build DPDK first cd %{dpdkdir} @@ -314,12 +311,10 @@ 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 @@ -329,6 +324,10 @@ ENABLED_DRIVERS+=( net/nfp net/qede net/vdev_netvsc +%if "%{dpdkver}" >= "23.11" + baseband/acc + common/nfp +%endif ) %endif @@ -345,6 +344,18 @@ done # If doing any updates, this must be aligned with: # https://access.redhat.com/articles/3538141 +%if "%{dpdkver}" < "23.11" +DISABLED_LIBS=( + gpudev + kni + jobstats + power +) + +for lib in "${DISABLED_LIBS[@]}"; do + disable_libs="${disable_libs:+$disable_libs,}"$lib +done +%else ENABLED_LIBS=( bbdev bitratestats @@ -370,11 +381,16 @@ ENABLED_LIBS=( for lib in "${ENABLED_LIBS[@]}"; do enable_libs="${enable_libs:+$enable_libs,}"$lib done +%endif %set_build_flags %__meson --prefix=%{_builddir}/dpdk-build \ --buildtype=plain \ +%if "%{dpdkver}" < "23.11" + -Ddisable_libs="$disable_libs" \ +%else -Denable_libs="$enable_libs" \ +%endif -Ddisable_apps="*" \ -Denable_drivers="$enable_drivers" \ -Dplatform=generic \ @@ -405,7 +421,7 @@ http://dpdk.org/doc/guides-%{dpdksver}/nics/index.html EOF cd - -%endif # build dpdk +%endif # And now for OVS... mkdir build-shared build-static @@ -584,9 +600,6 @@ rm -f $RPM_BUILD_ROOT%{_includedir}/ovn/* popd %endif -%clean -rm -rf $RPM_BUILD_ROOT - %preun %if 0%{?systemd_preun:1} %systemd_preun openvswitch.service @@ -646,6 +659,10 @@ exit 0 %files -n python3-%{pkgname} %{python3_sitearch}/ovs %{python3_sitearch}/ovs-*.egg-info +%if "%{version}" >= "3.5.0" +%{_bindir}/ovs-flowviz +%{_mandir}/man8/ovs-flowviz.8* +%endif %doc LICENSE %files test @@ -770,6 +787,25 @@ exit 0 %endif %changelog +* Tue Feb 25 2025 Timothy Redaelli - 3.4.0-52 +- Add include.mk [RH git: 68e9fb2841] + + +* Tue Feb 25 2025 Timothy Redaelli - 3.4.0-51 +- Use symlink for README.rst [RH git: d431d15c5a] + + +* Tue Feb 25 2025 Timothy Redaelli - 3.4.0-50 +- Add 'redhat/' from commit '48fbd3b1cdb21757859dd27b51d71f0e01145222' [RH git: c229aeb560] + git-subtree-dir: redhat + git-subtree-mainline: 8773938372ce0ddd7642e393f4f2b280e5b2eb44 + git-subtree-split: 48fbd3b1cdb21757859dd27b51d71f0e01145222 + + +* Tue Feb 25 2025 Timothy Redaelli - 3.4.0-49 +- Remove redhat/ [RH git: 8773938372] + + * Tue Feb 18 2025 Open vSwitch CI - 3.4.0-48 - Merging dpdk subtree [RH git: 160c386e13] Commit list: