diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 6cfb2d7..a2ef1b8 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -56,8 +56,8 @@ Name: %{pkgname} Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ -Version: 3.1.0 -Release: 149%{?dist} +Version: 3.1.6 +Release: 153%{?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.1.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,7 +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 -Patch0: openvswitch-%{version}.patch +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 @@ -160,6 +161,8 @@ BuildRequires: python3-pyelftools %endif # DPDK driver dependencies BuildRequires: zlib-devel numactl-devel libarchive-devel +# libarchive static dependencies +BuildRequires: bzip2-devel libacl-devel libxml2-devel libzstd-devel lz4-devel xz-devel %ifarch x86_64 BuildRequires: rdma-core-devel >= 15 libmnl-devel %endif @@ -246,26 +249,28 @@ 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 0%{?PATCH0:1}%{!?PATCH0:0} %patch -P0 -p1 +%endif %build %if 0%{?rhel} && 0%{?rhel} < 9 @@ -285,7 +290,7 @@ export PATH="$PATH:%{_builddir}/pytmp/bin" ./boot.sh -%ifarch %{dpdkarches} # build dpdk +%ifarch %{dpdkarches} # Lets build DPDK first cd %{dpdkdir} @@ -316,6 +321,10 @@ ENABLED_DRIVERS+=( net/nfp net/qede net/vdev_netvsc +%if "%{dpdkver}" >= "23.11" + baseband/acc + common/nfp +%endif ) %endif @@ -330,22 +339,9 @@ for driver in "${ENABLED_DRIVERS[@]}"; do enable_drivers="${enable_drivers:+$enable_drivers,}"$driver done -# As of 21.11-rc3, following libraries can be disabled: -# optional_libs = [ -# 'bitratestats', -# 'gpudev', -# 'gro', -# 'gso', -# 'kni', -# 'jobstats', -# 'latencystats', -# 'metrics', -# 'pdump', -# 'power', -# 'vhost', -# ] # If doing any updates, this must be aligned with: # https://access.redhat.com/articles/3538141 +%if "%{dpdkver}" < "23.11" DISABLED_LIBS=( gpudev kni @@ -356,11 +352,42 @@ DISABLED_LIBS=( for lib in "${DISABLED_LIBS[@]}"; do disable_libs="${disable_libs:+$disable_libs,}"$lib done +%else +ENABLED_LIBS=( + bbdev + bitratestats + bpf + cmdline + cryptodev + dmadev + gro + gso + hash + ip_frag + latencystats + member + meter + metrics + pcapng + pdump + security + stack + vhost +) + +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 \ @@ -391,7 +418,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 @@ -570,9 +597,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 @@ -632,6 +656,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 @@ -756,6 +784,25 @@ exit 0 %endif %changelog +* Wed Feb 26 2025 Timothy Redaelli - 3.1.0-153 +- Add include.mk [RH git: e2ea9ebdca] + + +* Wed Feb 26 2025 Timothy Redaelli - 3.1.0-152 +- Use symlink for README.rst [RH git: d39cb47a90] + + +* Wed Feb 26 2025 Timothy Redaelli - 3.1.0-151 +- Add 'redhat/' from commit '48fbd3b1cdb21757859dd27b51d71f0e01145222' [RH git: 15d9d05f4b] + git-subtree-dir: redhat + git-subtree-mainline: 283de2b893f79dd5bcea345c3af70e591ab79287 + git-subtree-split: 48fbd3b1cdb21757859dd27b51d71f0e01145222 + + +* Wed Feb 26 2025 Timothy Redaelli - 3.1.0-150 +- Remove redhat/ [RH git: 283de2b893] + + * Thu Feb 20 2025 Open vSwitch CI - 3.1.0-149 - Merging upstream branch-3.1 [RH git: f4088ad6ed] Commit list: @@ -944,7 +991,7 @@ exit 0 * Fri Jan 31 2025 Timothy Redaelli - 3.1.0-146 -- template: use %patch -P0 instead of %patch0 [RH git: 19f585eb57] +- template: use %%patch -P0 instead of %%patch0 [RH git: 19f585eb57] * Fri Jan 31 2025 Kevin Traynor - 3.1.0-145