frr: update to 10.3.1

also add watchfrr and zebra as build daemon dependencies

Signed-off-by: Lucian CRISTIAN <lucian.cristian@gmail.com>
This commit is contained in:
Lucian CRISTIAN
2025-06-08 17:59:17 +03:00
committed by Tianling Shen
parent 04493a8a8f
commit cd1439a6c6
3 changed files with 9 additions and 9 deletions

View File

@@ -7,15 +7,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=frr PKG_NAME:=frr
PKG_VERSION:=10.2.1 PKG_VERSION:=10.3.1
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE_DATE:=2025-01-29 PKG_SOURCE_DATE:=2025-06-08
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
PKG_SOURCE_VERSION:=05f9d44340755e5ca612e4852b710f4037254e7b PKG_SOURCE_VERSION:=44789ae469c30896d8b13b30bd429c01a4b0d96e
PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_SOURCE_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_SOURCE_VERSION)?
PKG_HASH:=8873e1f638fc4457a30227181e3fd26414795e63dbb11911c2e669876589f228 PKG_HASH:=b4c341be50dc76a3b96727dc41310745171e0d9affb137b8894d14f6eb6e226a
PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com> PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
@@ -132,7 +132,7 @@ define BuildDaemon
ifeq ($(1),bgpd) ifeq ($(1),bgpd)
KCONFIG:=CONFIG_TCP_MD5SIG=y KCONFIG:=CONFIG_TCP_MD5SIG=y
endif endif
DEPENDS+=$(2) DEPENDS+=$(2) +frr-watchfrr +frr-zebra
endef endef
# if [ "$(1)" == "bfdd" ]; then \ # if [ "$(1)" == "bfdd" ]; then \
# export HAVE_BFDD == 1 ; fi # export HAVE_BFDD == 1 ; fi

View File

@@ -1,6 +1,6 @@
--- a/lib/northbound.h --- a/lib/northbound.h
+++ b/lib/northbound.h +++ b/lib/northbound.h
@@ -665,11 +665,7 @@ struct frr_yang_module_info { @@ -711,11 +711,7 @@ struct frr_yang_module_info {
/* Priority - lower priorities are processed first. */ /* Priority - lower priorities are processed first. */
uint32_t priority; uint32_t priority;
@@ -11,4 +11,4 @@
-#endif -#endif
}; };
/* Northbound error codes. */ /* Default priority. */

View File

@@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -913,7 +913,6 @@ AC_DEFINE_UNQUOTED([DFLT_NAME], ["$DFLT_ @@ -932,7 +932,6 @@ AC_DEFINE_UNQUOTED([DFLT_NAME], ["$DFLT_
# #
AS_IF([test "$host" = "$build"], [ AS_IF([test "$host" = "$build"], [