diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | f22e84b9b9ff70a45f8d5e47f6d516324b81f8c8.patch | 40 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | vpp.spec | 16 |
4 files changed, 54 insertions, 5 deletions
@@ -39,3 +39,4 @@ /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 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 @@ -1144051badc66e94b94f2c818fff355d vpp-25.10-rc0~141_ge2ba9ec4e.tar.xz +c5fa3a97e59ce0556efcb0a328e2ab7a vpp-25.10-rc0~206_gae77ea936.tar.xz @@ -23,11 +23,12 @@ Name: vpp Summary: Vector Packet Processing License: ASL 2.0 Version: 25.10 -Release: 0.141.rc0.20250710gite2ba9ec4e%{?dist} -Source: %{name}-%{version}-rc0~141_ge2ba9ec4e.tar.xz +Release: 0.206.rc0.20250805gitae77ea936%{?dist} +Source: %{name}-%{version}-rc0~206_gae77ea936.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-devel python3-ply python3-pip python3-wheel BuildRequires: check-devel subunit-devel BuildRequires: selinux-policy-devel BuildRequires: libmnl-devel libnl3-devel @@ -57,6 +58,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 @@ -109,6 +111,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 @@ -230,6 +238,7 @@ fi %{_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 @@ -268,6 +277,5 @@ fi %defattr(-,bin,bin) %{_libdir}/vpp_plugins %{_libdir}/vpp_api_test_plugins -%{_libdir}/vpp_crypto_engines %{_libdir}/vat2_plugins %{_datadir}/vpp/api/plugins |