From 6af39e0b5257f5cd149a1f9ea83d05447673be46 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Mon, 10 Nov 2025 17:52:04 +0000 Subject: automatic import of vpp --- .gitignore | 1 + sources | 2 +- vpp.spec | 17 ++++++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index eacb074..19152e1 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /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/sources b/sources index bc6a040..8f62486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13c1ed6cc0893c2ce199323b5a218555 vpp-25.10-rc0~278_ge070068b7.tar.xz +16cd733bee2ac2eafceb3ff1ef19f410 vpp-26.02-rc0~187_gc0f4f9ce7.tar.xz diff --git a/vpp.spec b/vpp.spec index a70cd5a..9d290b0 100644 --- a/vpp.spec +++ b/vpp.spec @@ -22,9 +22,9 @@ Name: vpp Summary: Vector Packet Processing License: ASL 2.0 -Version: 25.10 -Release: 0.278.rc0.20250905gite070068b7%{?dist} -Source: %{name}-%{version}-rc0~278_ge070068b7.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 @@ -36,7 +36,7 @@ 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 @@ -79,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 @@ -127,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 @@ -224,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 @@ -238,7 +243,6 @@ 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 @@ -266,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 -- cgit v1.2.3