frr: enable frr-vtysh by defalult and hide it
authorGeorgi Valkov <[email protected]>
Thu, 2 May 2024 12:23:22 +0000 (15:23 +0300)
committerTianling Shen <[email protected]>
Tue, 28 May 2024 05:59:43 +0000 (13:59 +0800)
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 <[email protected]>
net/frr/Makefile

index 9defb6dfce2e92aef45e1bc889ab17a0b9b819a4..9e166abd1f56d818cfbb617e205eab66707fbacb 100644 (file)
@@ -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