summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore11
-rw-r--r--sources12
-rw-r--r--vpp-ext-deps.spec33
3 files changed, 36 insertions, 20 deletions
diff --git a/.gitignore b/.gitignore
index ac31bff..801c2ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,14 @@
/vpp-ext-deps-25.06-rc0~39_g87c7d4aca.tar.xz
/vpp-ext-deps-25.06-rc0~66_g5985e8683.tar.xz
/vpp-ext-deps-25.06-rc0~110_g429abe7b0.tar.xz
+/v25.05.tar.gz
+/vpp-ext-deps-25.06-rc0~240_g5a1d84451.tar.xz
+/dpdk-25.07.tar.xz
+/rdma-core-58.0.tar.gz
+/vpp-ext-deps-25.10-rc0~206_gae77ea936.tar.xz
+/xdp-tools-1.5.5.tar.gz
+/daq-3.0.21.tar.gz
+/vpp-25.10-rc0~278_ge070068b7.tar.xz
+/libcbor-0.13.0.tar.gz
+/v25.09.tar.gz
+/vpp-26.02-rc0~156_g3f06cc6d3.tar.xz
diff --git a/sources b/sources
index 93fd3d1..693a242 100644
--- a/sources
+++ b/sources
@@ -1,11 +1,13 @@
-2750f9a23fa44417a2073f399f645652 dpdk-24.11.1.tar.xz
+6eb15f0891d2e038bea16d4277c08908 daq-3.0.21.tar.gz
+1a28ab219aed62479c59bc1492bda9af dpdk-25.07.tar.xz
+5256fc1e1a71daa969039609863b8476 libcbor-0.13.0.tar.gz
4a07b6d42d7a46a6b6e9604fae7da9aa meson-0.57.2.tar.gz
a1b4b7b32e1301de037b093b55c030c0 pyelftools-0.29-py2.py3-none-any.whl
fc388ccde2f7d677b92ff3cb3fd387e4 quicly_0.1.5-vpp.tar.gz
-6665af4934e7e0c2d4946e2995afe897 rdma-core-55.0.tar.gz
+2878225fe4144896546462b7782ef36f rdma-core-58.0.tar.gz
7771fec8ee1eecdeb933993d86b70d6e setuptools-68.1.0-py3-none-any.whl
-fa8c8f390c3291b8e4203facc3bbc2ba v0.6.tar.gz
c0207b0a2136920461cc56aad06072a8 v2.0.tar.gz
-7ab80e3399f86f29cbb3de09acea23e1 vpp-ext-deps-25.06-rc0~110_g429abe7b0.tar.xz
+593be96859fe9d8660f87d3bcdb1b008 v25.09.tar.gz
+192b0dad28bb4c3fedf1c4d8167ba311 vpp-26.02-rc0~156_g3f06cc6d3.tar.xz
ee856798545b551c3ac5675007ffa36c wheel-0.41.1-py3-none-any.whl
-6e4a49ceea8354bb7bb3b55990e9aed7 xdp-tools-1.2.9.tar.gz
+e0dce3935fe44a7eb91d667037d5c0e5 xdp-tools-1.5.5.tar.gz
diff --git a/vpp-ext-deps.spec b/vpp-ext-deps.spec
index 711e775..39189f4 100644
--- a/vpp-ext-deps.spec
+++ b/vpp-ext-deps.spec
@@ -1,29 +1,31 @@
%undefine _missing_build_ids_terminate_build
%undefine __os_install_post
%undefine _auto_set_build_flags
-%define _install_dir /opt/vpp/external/%(uname -m)
-%define _make_args -C build/external INSTALL_DIR=%{buildroot}%{_install_dir}
+%define _install_dir /opt/vpp/external/%(uname -m)
+%define _make_args -C build/external INSTALL_DIR=%{_install_dir} DESTDIR=%{buildroot} PKG_CONFIG_PATH=%{buildroot}%{_install_dir}/lib/pkgconfig:$PKG_CONFIG_PATH
%if 0%{?openEuler}
%global __strip /usr/bin/eu-strip
%global __brp_strip_static_archive %{_rpmconfigdir}/brp-strip-static-archive /usr/bin/strip
%endif
Name: vpp-ext-deps
-Version: 25.06
-Release: 0.110.rc0.20250319git429abe7b0%{?dist}
+Version: 26.02
+Release: 0.156.rc0.20251101git3f06cc6d3%{?dist}
Summary: VPP development package with external dependencies
License: BSD
-Source: %{name}-%{version}-rc0~110_g429abe7b0.tar.xz
-Source1: https://fast.dpdk.org/rel/dpdk-24.11.1.tar.xz
+Source: vpp-%{version}-rc0~156_g3f06cc6d3.tar.xz
+Source1: https://fast.dpdk.org/rel/dpdk-25.07.tar.xz
Source2: https://github.com/intel/intel-ipsec-mb/archive/v2.0.tar.gz
Source3: https://github.com/vpp-quic/quicly/releases/download/v0.1.5-vpp/quicly_0.1.5-vpp.tar.gz
-Source4: https://github.com/xdp-project/xdp-tools/releases/download/v1.2.9/xdp-tools-1.2.9.tar.gz
-Source5: https://github.com/linux-rdma/rdma-core/releases/download/v55.0/rdma-core-55.0.tar.gz
-Source6: https://github.com/MarvellEmbeddedProcessors/marvell-octeon-roc/archive/refs/tags/v0.6.tar.gz
-Source7: https://files.pythonhosted.org/packages/5d/0e/0c72dadd01af2da712eb987e2b7662e2e2c2c34fcdfe3cc6d765bddb2db3/meson-0.57.2.tar.gz
-Source8: https://files.pythonhosted.org/packages/b8/49/b3b29c52b09075fb77f69309763a563b4054d5808a3f3b95df3a62ef3d3f/setuptools-68.1.0-py3-none-any.whl
-Source9: https://files.pythonhosted.org/packages/28/f5/6955d7b3a5d71ce6bac104f9cf98c1b0513ad656cdaca8ea7d579196f771/wheel-0.41.1-py3-none-any.whl
-Source10: https://files.pythonhosted.org/packages/04/7c/867630e6e6293793f838b31034aa1875e1c3bd8c1ec34a0929a2506f350c/pyelftools-0.29-py2.py3-none-any.whl
+Source4: https://github.com/xdp-project/xdp-tools/releases/download/v1.5.5/xdp-tools-1.5.5.tar.gz
+Source5: https://github.com/linux-rdma/rdma-core/releases/download/v58.0/rdma-core-58.0.tar.gz
+Source6: https://github.com/MarvellEmbeddedProcessors/marvell-octeon-roc/archive/refs/tags/v25.09.tar.gz
+Source7: https://github.com/snort3/libdaq/archive/refs/tags/v3.0.21.tar.gz#/daq-3.0.21.tar.gz
+Source8: https://github.com/PJK/libcbor/archive/refs/tags/v0.13.0.tar.gz#/libcbor-0.13.0.tar.gz
+Source9: https://files.pythonhosted.org/packages/5d/0e/0c72dadd01af2da712eb987e2b7662e2e2c2c34fcdfe3cc6d765bddb2db3/meson-0.57.2.tar.gz
+Source10: https://files.pythonhosted.org/packages/b8/49/b3b29c52b09075fb77f69309763a563b4054d5808a3f3b95df3a62ef3d3f/setuptools-68.1.0-py3-none-any.whl
+Source11: https://files.pythonhosted.org/packages/28/f5/6955d7b3a5d71ce6bac104f9cf98c1b0513ad656cdaca8ea7d579196f771/wheel-0.41.1-py3-none-any.whl
+Source12: https://files.pythonhosted.org/packages/04/7c/867630e6e6293793f838b31034aa1875e1c3bd8c1ec34a0929a2506f350c/pyelftools-0.29-py2.py3-none-any.whl
BuildRequires: openssl openssl-devel
BuildRequires: python3-devel libpcap-devel
BuildRequires: libmnl-devel libnl3-devel
@@ -36,9 +38,9 @@ BuildRequires: clang cmake ninja-build
VPP development package with external dependencies
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n vpp-%{version}
mkdir build/external/downloads
-cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} build/external/downloads
+cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} build/external/downloads
%install
make %{_make_args} config
@@ -47,3 +49,4 @@ export QA_SKIP_BUILD_ROOT=1
%files
%{_install_dir}
+%{_sysconfdir}/vpp