2
1
Эх сурвалжийг харах

package/quagga: add nhrpd option

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 6 жил өмнө
parent
commit
8ee0e2e17b

+ 6 - 0
package/quagga/Config.in

@@ -38,6 +38,12 @@ config BR2_PACKAGE_QUAGGA_ISISD
 	help
 	help
 	  Enable isisd support in quagga.
 	  Enable isisd support in quagga.
 
 
+config BR2_PACKAGE_QUAGGA_NHRPD
+	bool "NHRPD protocol"
+	select BR2_PACKAGE_C_ARES
+	help
+	  Build Next Hop Routing Protocol daemon.
+
 config BR2_PACKAGE_QUAGGA_OSPFD
 config BR2_PACKAGE_QUAGGA_OSPFD
 	bool "OSPFv2 protocol"
 	bool "OSPFv2 protocol"
 	help
 	help

+ 8 - 2
package/quagga/quagga.mk

@@ -16,8 +16,7 @@ QUAGGA_LICENSE_FILES = COPYING
 QUAGGA_CONF_OPTS = \
 QUAGGA_CONF_OPTS = \
 	--program-transform-name='' \
 	--program-transform-name='' \
 	--sysconfdir=/etc/quagga \
 	--sysconfdir=/etc/quagga \
-	--localstatedir=/var/run/quagga \
-	--disable-nhrpd
+	--localstatedir=/var/run/quagga
 
 
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 QUAGGA_CONF_OPTS += --enable-capabilities
 QUAGGA_CONF_OPTS += --enable-capabilities
@@ -59,6 +58,13 @@ define QUAGGA_PERMISSIONS
 	/etc/quagga d 755 quagga quagga - - - - -
 	/etc/quagga d 755 quagga quagga - - - - -
 endef
 endef
 
 
+ifeq ($(BR2_PACKAGE_QUAGGA_NHRPD),y)
+QUAGGA_CONF_OPTS += --enable-nhrpd
+QUAGGA_DEPENDENCIES += c-ares
+else
+QUAGGA_CONF_OPTS += --disable-nhrpd
+endif
+
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
 QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
 QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
 QUAGGA_CONF_OPTS += --enable-snmp=agentx
 QUAGGA_CONF_OPTS += --enable-snmp=agentx