Commit b8ce1fb1 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

quagga: bump version, fix conflicting options, enhance help 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 9f36bd49

CHANGES

+5 −5
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ 
	mdadm, mesa3d, metacity, mtd-utils, mysql_client, nano, nbd,

	ncftp, neon, netperf, netsnmp, ng-spice-rework, ntfsprogs,

	ntp, openntpd, openssh, openvpn, oprofile, pango, patch, pcre,

	php, pkg-config, prboom, radvd, rdesktop, ruby, qt, samba,

	sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info,

	speex, sqlite, squashfs, strace, sylpheed, taglib, tcpdump,

	thttpd, tiff, tn5250, udev, udpcast, usbmount, usbutils,

	vsftpd, vtun, which, wpa_supplicant,

	php, pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga,

	samba, sawman, sdl_mixer, sdl_sound, setserial,

	shared-mime-info, speex, sqlite, squashfs, strace, sylpheed,

	taglib, tcpdump, thttpd, tiff, tn5250, udev, udpcast,

	usbmount, usbutils, vsftpd, vtun, which, wpa_supplicant,

	xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},

	xdriver-xf86-input-{mouse,synaptics,vmmouse,void},

	xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},

package/quagga/Config.in

+40 −38
Original line number Diff line number Diff line 
config BR2_PACKAGE_QUAGGA

	bool "quagga"

	help

	  routing software suite, providing implementations of

	  OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4.

	  Routing software suite, providing implementations of

	  OSPFv2, OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+.



	  http://www.quagga.net/
@@ -13,62 +13,64 @@ config BR2_PACKAGE_QUAGGA_ZEBRA 
	help

	  Build zebra daemon.



config BR2_PACKAGE_QUAGGA_BGPD

	bool "bgpd support"

config BR2_PACKAGE_QUAGGA_TCP_ZEBRA

	bool "Use TCP sockets between zebra and protocol daemons"

	help

	  Enable bgpd support in quagga.

	  Use a TCP socket to communicate between zebra (supervisor) and

	  the different protocol daemons.



config BR2_PACKAGE_QUAGGA_RIPD

	bool "ripd support"

	  You'll want this enabled if zebra and the protocol daemon(s) run

	  on different hosts.



config BR2_PACKAGE_QUAGGA_BGPD

	bool "BPGv4+ protocol"

	help

	  Enable ripd support in quagga.

	  Build bpgd daemon.



config BR2_PACKAGE_QUAGGA_RIPNGD

	bool "ripngd support"

	depends on BR2_INET_IPV6

config BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE

	bool "BGP route announcement"

	depends on BR2_PACKAGE_QUAGGA_BGPD



config BR2_PACKAGE_QUAGGA_ISISD

	bool "IS-IS protocol"

	help

	  Enable ripngd support in quagga.

	  Enable isisd support in quagga.



config BR2_PACKAGE_QUAGGA_OSPFD

	bool "ospfd support"

	bool "OSPFv2 protocol"

	help

	  Enable ospfd support in quagga.

	  Build ospfd daemon.



config BR2_PACKAGE_QUAGGA_OPAQUE_LSA

	bool "OSPF Opaque-LSA with OSPFAPI support (RFC2370)"

	depends on BR2_PACKAGE_QUAGGA_OSPFD



config BR2_PACKAGE_QUAGGA_OSPF6D

	bool "ospf6d support"

	bool "OSPFv3 (IPv6) protocol"

	depends on BR2_INET_IPV6

	help

	  Enable ospf6d support in quagga.

	  Build ospf6d daemon.



config BR2_PACKAGE_QUAGGA_WATCHQUAGGA

	bool "watchquagga support"

config BR2_PACKAGE_QUAGGA_RIPD

	bool "RIPv2/v3 protocol"

	help

	  Enable watchquagga support in quagga.

	  Build ripd daemon.



config BR2_PACKAGE_QUAGGA_ISISD

	bool "isisd support"

config BR2_PACKAGE_QUAGGA_RIPNGD

	bool "RIPng (IPv6) protocol"

	depends on BR2_INET_IPV6

	help

	  Enable isisd support in quagga.

	  Build ripngd daemon.



config BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE

	bool "BGP route announcement"



config BR2_PACKAGE_QUAGGA_NETLINK

	bool "use linux netlink interface"

	default y

config BR2_PACKAGE_QUAGGA_WATCHQUAGGA

	bool "Build watchquagga"

	help

	  Build and install watchquagga, a zebra/protocol daemon supervisor.



config BR2_PACKAGE_QUAGGA_SNMP

	bool "SNMP support"

	depends on !BR2_TOOLCHAIN_EXTERNAL

	select BR2_PACKAGE_NETSNMP



comment "quagga snmp support broken with external toolchains"

	depends on BR2_TOOLCHAIN_EXTERNAL



config BR2_PACKAGE_QUAGGA_TCP_ZEBRA

	bool "TCP/IP socket connection between zebra and proto daemon"



config BR2_PACKAGE_QUAGGA_OPAGUE_LSA

	bool "OSPF Opaque-LSA with OSPFAPI support (RFC2370)"

	help

	  Make quagga information available via SNMP SMUX.



endif

package/quagga/quagga.mk

+3 −9
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
# quagga suite

#

#############################################################

QUAGGA_VERSION:=0.99.16

QUAGGA_VERSION:=0.99.17

QUAGGA_SOURCE:=quagga-$(QUAGGA_VERSION).tar.gz

QUAGGA_SITE:=http://www.quagga.net/download/



QUAGGA_DEPENDENCIES = host-gawk

QUAGGA_LIBTOOL_PATCH = NO

QUAGGA_CONF_OPT = --program-transform-name=''

QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink



ifeq ($(BR2_PACKAGE_QUAGGA_ZEBRA),y)

QUAGGA_CONF_OPT+=--enable-zebra
@@ -65,12 +65,6 @@ else 
QUAGGA_CONF_OPT+=--disable-bgp-announce

endif



ifeq ($(BR2_PACKAGE_QUAGGA_NETLINK),y)

QUAGGA_CONF_OPT+=--enable-netlink

else

QUAGGA_CONF_OPT+=--disable-netlink

endif



ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)

QUAGGA_CONF_OPT+=--enable-snmp

QUAGGA_DEPENDENCIES+=netsnmp
@@ -84,7 +78,7 @@ else 
QUAGGA_CONF_OPT+=--disable-tcp-zebra

endif



ifeq ($(BR2_PACKAGE_QUAGGA_OPAGUE_LSA),y)

ifeq ($(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),y)

QUAGGA_CONF_OPT+=--enable-opaque-lsa

else

QUAGGA_CONF_OPT+=--disable-opaque-lsa