frr: update to 10.4.1

switch to release codeload version
fix startup error messages

Signed-off-by: Lucian CRISTIAN <lucian.cristian@gmail.com>
This commit is contained in:
Lucian CRISTIAN
2025-11-11 22:57:49 +02:00
committed by Hannu Nyman
parent 6af94b1fa9
commit 036868c669
4 changed files with 12 additions and 12 deletions

View File

@@ -7,19 +7,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=frr
PKG_VERSION:=10.3.1
PKG_VERSION:=10.4.1
PKG_RELEASE:=1
PKG_SOURCE_DATE:=2025-06-08
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
PKG_SOURCE_VERSION:=44789ae469c30896d8b13b30bd429c01a4b0d96e
PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_SOURCE_VERSION)?
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_NAME)-$(PKG_VERSION)?
PKG_HASH:=8e4003eaba168626c5ea7a6735f2c85c87b04214e6f8c8f2715b21f8ae40970b
PKG_HASH:=b4c341be50dc76a3b96727dc41310745171e0d9affb137b8894d14f6eb6e226a
PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0-only LGPL-2.1-only
PKG_CPE_ID:=cpe:/a:ffrouting:ffrouting
@@ -215,8 +214,9 @@ define Package/frr-watchfrr/install
endef
define Package/frr-zebra/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libmlag_pb.so* $(1)/usr/lib/
endef
define Package/frr-pythontools/install

View File

@@ -35,7 +35,7 @@ FRR_DEFAULT_PROFILE="traditional" # traditional / datacenter
# - keep zebra first
# - watchfrr does NOT belong in this list
DAEMONS="zebra mgmtd bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
DAEMONS="mgmtd zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd pim6d ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
RELOAD_SCRIPT="$D_PATH/frr-reload.py"

View File

@@ -1,6 +1,6 @@
--- a/lib/northbound.h
+++ b/lib/northbound.h
@@ -711,11 +711,7 @@ struct frr_yang_module_info {
@@ -747,11 +747,7 @@ struct frr_yang_module_info {
/* Priority - lower priorities are processed first. */
uint32_t priority;

View File

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