diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | f22e84b9b9ff70a45f8d5e47f6d516324b81f8c8.patch | 40 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | vpp.spec | 29 |
4 files changed, 71 insertions, 9 deletions
@@ -37,3 +37,12 @@ /vpp-25.06-rc0~218_g0352899c0.tar.xz /vpp-25.06-rc0~240_g5a1d84451.tar.xz /vpp-25.06-rc0~252_gb704623f1.tar.xz +/vpp-25.10-rc0~10_gc3f849a0a.tar.xz +/vpp-25.10-rc0~141_ge2ba9ec4e.tar.xz +/vpp-25.10-rc0~206_gae77ea936.tar.xz +/vpp-25.10-rc0~217_gae4c21faa.tar.xz +/vpp-25.10-rc0~236_gd282e2c19.tar.xz +/vpp-25.10-rc0~247_gd877375b3.tar.xz +/vpp-25.10-rc0~271_g72b1b85bf.tar.xz +/vpp-25.10-rc0~278_ge070068b7.tar.xz +/vpp-26.02-rc0~187_gc0f4f9ce7.tar.xz diff --git a/f22e84b9b9ff70a45f8d5e47f6d516324b81f8c8.patch b/f22e84b9b9ff70a45f8d5e47f6d516324b81f8c8.patch new file mode 100644 index 0000000..876407d --- /dev/null +++ b/f22e84b9b9ff70a45f8d5e47f6d516324b81f8c8.patch @@ -0,0 +1,40 @@ +From f22e84b9b9ff70a45f8d5e47f6d516324b81f8c8 Mon Sep 17 00:00:00 2001 +From: Damjan Marion <damarion@cisco.com> +Date: Thu, 17 Jul 2025 22:33:55 +0000 +Subject: [PATCH] papi: fix deprecated call to setup.py + +Type: fix +Change-Id: I0e5e61395b619e28cf75cde1770d631b47e8c0b7 +Signed-off-by: Damjan Marion <damarion@cisco.com> +--- + src/vpp-api/python/CMakeLists.txt | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/src/vpp-api/python/CMakeLists.txt b/src/vpp-api/python/CMakeLists.txt +index 3059619ff21a..7e6d7a63c2b9 100644 +--- a/src/vpp-api/python/CMakeLists.txt ++++ b/src/vpp-api/python/CMakeLists.txt +@@ -19,13 +19,17 @@ install( + CODE " + execute_process( + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- COMMAND ${PYTHON_EXECUTABLE} ./setup.py +- install ++ COMMAND ${PYTHON_EXECUTABLE} -m pip ++ install . ++ --disable-pip-version-check + --root=\$ENV{DESTDIR}/ + --prefix=${CMAKE_INSTALL_PREFIX} +- --single-version-externally-managed +- bdist_egg +- OUTPUT_QUIET +- )" ++ --no-deps ++ RESULT_VARIABLE _pip_result ++ ) ++ if(NOT _pip_result EQUAL 0) ++ message(FATAL_ERROR \"pip install failed with code: \${_pip_result}\") ++ endif() ++ " + COMPONENT vpp-api-python + ) @@ -1 +1 @@ -debd9466a45ab9168cfc4916c4190446 vpp-25.06-rc0~252_gb704623f1.tar.xz +16cd733bee2ac2eafceb3ff1ef19f410 vpp-26.02-rc0~187_gc0f4f9ce7.tar.xz @@ -22,19 +22,21 @@ Name: vpp Summary: Vector Packet Processing License: ASL 2.0 -Version: 25.06 -Release: 0.252.rc0.20250516gitb704623f1%{?dist} -Source: %{name}-%{version}-rc0~252_gb704623f1.tar.xz +Version: 26.02 +Release: 0.187.rc0.20251107gitc0f4f9ce7%{?dist} +Source: %{name}-%{version}-rc0~187_gc0f4f9ce7.tar.xz +Patch0: https://github.com/FDio/vpp/commit/f22e84b9b9ff70a45f8d5e47f6d516324b81f8c8.patch BuildRequires: vpp-ext-deps BuildRequires: systemd chrpath BuildRequires: python3-devel python3-ply +BuildRequires: python3-setuptools python3-pip python3-wheel BuildRequires: check-devel subunit-devel BuildRequires: selinux-policy-devel BuildRequires: libmnl-devel libnl3-devel BuildRequires: apr-devel numactl-devel BuildRequires: openssl-devel libunwind-devel BuildRequires: elfutils-libelf-devel libpcap-devel -BuildRequires: clang cmake ninja-build +BuildRequires: clang(major) < 21 clang cmake ninja-build %if 0%{?fedora} >= 41 BuildRequires: openssl-devel-engine %endif @@ -57,6 +59,7 @@ svm - vm library vlib - vector processing library vlib-api - binary API library vnet - network stack library +vpp_crypto_engines - cryptography libraries %package devel Summary: VPP header files, static libraries @@ -76,7 +79,7 @@ vppinfra %package plugins Summary: Vector Packet Processing--runtime plugins Group: System Environment/Libraries -Requires: vpp = %{version}-%{release} numactl-libs +Requires: vpp = %{version}-%{release} %description plugins This package contains VPP plugins @@ -109,6 +112,12 @@ This package contains a tailored VPP SELinux policy %prep %setup -q -n %{name}-%{version} +%if 0%{?rhel} == 8 +%patch -P 0 -p1 -R +%else +sed -i -r 's/--no-deps/--no-deps --no-build-isolation/' src/vpp-api/python/CMakeLists.txt +%endif + %pre # Add the vpp group groupadd -f -r vpp @@ -118,6 +127,10 @@ groupadd -f -r vpp export VPP_EXCLUDED_PLUGINS=tlsopenssl %endif +%if %{defined clang20_resource_dir} +export CC=/usr/bin/clang-20 +%endif + make -C build-root V=1 PLATFORM=vpp TAG=vpp install-packages cd extras/selinux && make -f %{_datadir}/selinux/devel/Makefile @@ -215,6 +228,7 @@ fi %{_bindir}/vppctl %{_bindir}/vpp_* %{_bindir}/svm* +%{_bindir}/selog_client_example %dir %{_sysconfdir}/vpp %config(noreplace) %{_sysconfdir}/sysctl.d/80-vpp.conf %config(noreplace) %{_sysconfdir}/vpp/startup.conf @@ -229,7 +243,7 @@ fi %defattr(-,bin,bin) %{_libdir}/lib*.so.* %{_libdir}/libvcl_ldpreload.so -%{_libdir}/libvppmem_preload.so +%{_libdir}/vpp_crypto_engines %dir %{_datadir}/vpp %dir %{_datadir}/vpp/api %{_datadir}/vpp/api/core @@ -256,7 +270,6 @@ fi %{_libdir}/cmake/vpp %{_libdir}/lib*.so %exclude %{_libdir}/libvcl_ldpreload.so -%exclude %{_libdir}/libvppmem_preload.so %{_datadir}/vpp/*.py %defattr(644,root,root,755) %dir %{_datadir}/doc/vpp @@ -266,8 +279,8 @@ fi %files plugins %defattr(-,bin,bin) +%{_libdir}/daq %{_libdir}/vpp_plugins %{_libdir}/vpp_api_test_plugins -%{_libdir}/vpp_crypto_engines %{_libdir}/vat2_plugins %{_datadir}/vpp/api/plugins |