From: Georgi Valkov Date: Thu, 2 May 2024 12:23:22 +0000 (+0300) Subject: frr: enable frr-vtysh by defalult and hide it X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=fd8467d1a215203c56ab821e009983f38b616990;p=feed%2Fpackages.git frr: enable frr-vtysh by defalult and hide it Fixes [1] lib/vty.c: In function 'vty_mgmt_resume_response': lib/vty.c:195:27: error: 'VTYSH_READ' undeclared (first use in this function); did you mean 'VTY_READ'? 195 | vty_event(VTYSH_READ, vty); | ^~~~~~~~~~ | VTY_READ The error is a bug in frr: not all use cases of the VTYSH_* enums are guarded by #ifdef VTYSH. These enums are enabled by the VTYSH macro, which is defined if sub package frr-vtysh is enabled in menuconfig. According to support ticket [2], building without frr-vtysh is no longer supported. [1] https://github.com/openwrt/packages/issues/24063 [2] https://github.com/FRRouting/frr/issues/15752#issuecomment-2059328993 Signed-off-by: Georgi Valkov --- diff --git a/net/frr/Makefile b/net/frr/Makefile index 9defb6dfce..9e166abd1f 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frr PKG_VERSION:=9.0.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_DATE:=2023-08-12 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz @@ -106,6 +106,8 @@ define Package/frr-vtysh DEPENDS+=+frr-libfrr +libreadline +libncurses +more TITLE:=integrated shell for frr routing software CONFLICTS:=quagga-vtysh + DEFAULT:=y if PACKAGE_frr + HIDDEN:=1 endef define Package/frr-watchfrr