From d0d67f7b33ffd9fe6c602dafb705aa802ce7e2ad Mon Sep 17 00:00:00 2001 From: Gabriel Goller Date: Fri, 7 Mar 2025 13:29:42 +0100 Subject: [PATCH] frr: bump from 8.5.2 to 10.2.1 This includes a new frr-test-tools package that we are not interested in (it's a testing package), so we ignore it with a BuildProfile. Signed-off-by: Gabriel Goller --- Makefile | 2 +- debian/control | 9 +++++++++ frr | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 696a5b7..74a66cc 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ $(ORIG_SRC_TAR): $(BUILDDIR) deb: $(DEBS) $(OTHER_DEBS) $(DBG_DEBS): $(MAIN_DEB) $(MAIN_DEB): $(BUILDDIR) - cd $(BUILDDIR); dpkg-buildpackage -b -uc -us --build-profiles="pkg.frr.nortrlib" + cd $(BUILDDIR); dpkg-buildpackage -b -uc -us --build-profiles="pkg.frr.nortrlib,pkg.frr.notesttools" lintian $(DEBS) .PHONY: dsc diff --git a/debian/control b/debian/control index 1aeea3d..d02dcf7 100644 --- a/debian/control +++ b/debian/control @@ -88,6 +88,15 @@ Description: FRRouting suite - BGP RPKI support (rtrlib) number. Build-Profiles: +Package: frr-test-tools +Architecture: linux-any +Depends: frr (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: FRRouting suite - Testing Tools + Adds FRR test tools, used in testing FRR. +Build-Profiles: + Package: frr-doc Section: doc Architecture: all diff --git a/frr b/frr index 1622c2e..5f0beaa 160000 --- a/frr +++ b/frr @@ -1 +1 @@ -Subproject commit 1622c2ece2f68e034b43fb037503514c2195aba5 +Subproject commit 5f0beaa0fdd00b7a60c1765067d1b6fa65ce96c0