From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 28 Aug 2006 20:02:36 +0000 (+0000)
Subject: Add quagga isisd, closes #735
X-Git-Tag: whiterussian_rc6~158
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8fc232984f7ce94a1dc573aa4799583f3831e7de;p=openwrt%2Fsvn-archive%2Fopenwrt.git

Add quagga isisd, closes #735

SVN-Revision: 4694
---

diff --git a/openwrt/package/quagga/Config.in b/openwrt/package/quagga/Config.in
index 7e893e2053..ea6bbd73bc 100644
--- a/openwrt/package/quagga/Config.in
+++ b/openwrt/package/quagga/Config.in
@@ -52,6 +52,14 @@ config BR2_PACKAGE_QUAGGA_RIPNGD
 	help
 	  A RIPNG (IPv6) routing engine for use with Quagga routing software.
 
+config BR2_PACKAGE_QUAGGA_ISISD
+        depends BR2_PACKAGE_QUAGGA
+        prompt"...-isisd - IS-IS routing engine"
+        tristate
+        default m if CONFIG_DEVEL
+        help
+          An IS-IS routing engine for use with Quagga routing software.
+
 config BR2_PACKAGE_QUAGGA_VTYSH
 	depends BR2_PACKAGE_QUAGGA
 	select BR2_PACKAGE_LIBREADLINE
diff --git a/openwrt/package/quagga/Makefile b/openwrt/package/quagga/Makefile
index 16acedcea7..5a73e57689 100644
--- a/openwrt/package/quagga/Makefile
+++ b/openwrt/package/quagga/Makefile
@@ -25,6 +25,7 @@ $(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,$(PKG_VERSION)-$(PKG_RELEAS
 $(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,QUAGGA_ISISD,quagga-isisd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.configured:
@@ -60,6 +61,8 @@ $(PKG_BUILD_DIR)/.configured:
 		--enable-vtysh \
 		--enable-user=quagga \
 		--enable-group=quagga \
+		--enable-multipath=8 \
+		--enable-isisd \
 	);
 	touch $@
 
@@ -116,6 +119,12 @@ $(IPKG_QUAGGA_RIPNGD):
 	$(RSTRIP) $(IDIR_QUAGGA_RIPNGD)
 	$(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(PACKAGE_DIR)
 
+$(IPKG_QUAGGA_ISISD):
+	install -d -m0755 $(IDIR_QUAGGA_ISISD)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/isisd $(IDIR_QUAGGA_ISISD)/usr/sbin/
+	$(RSTRIP) $(IDIR_QUAGGA_ISISD)
+	$(IPKG_BUILD) $(IDIR_QUAGGA_ISISD) $(PACKAGE_DIR)
+
 $(IPKG_QUAGGA_VTYSH):
 	install -d -m0755 $(IDIR_QUAGGA_VTYSH)/usr/bin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/
diff --git a/openwrt/package/quagga/files/quagga.init b/openwrt/package/quagga/files/quagga.init
index 01f8d7137d..1c6f3783bf 100644
--- a/openwrt/package/quagga/files/quagga.init
+++ b/openwrt/package/quagga/files/quagga.init
@@ -27,7 +27,7 @@ ARG_DAEMONS=$*
 BINDIR=/usr/sbin
 CONFDIR=/etc/quagga
 STATEDIR=/var/run/quagga
-DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
+DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd isisd"
 DAEMON_FLAGS=-d
 WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
 WATCHQUAGGA_CMD="$0 watchrestart"
diff --git a/openwrt/package/quagga/ipkg/quagga-isisd.control b/openwrt/package/quagga/ipkg/quagga-isisd.control
new file mode 100644
index 0000000000..23b1da596d
--- /dev/null
+++ b/openwrt/package/quagga/ipkg/quagga-isisd.control
@@ -0,0 +1,6 @@
+Package: quagga-isisd
+Priority: optional
+Section: net
+Depends: quagga
+Description: An IS-IS routing engine for use with Quagga
+ routing software
diff --git a/openwrt/package/quagga/ipkg/quagga.control b/openwrt/package/quagga/ipkg/quagga.control
index 303f299e81..e02fc62aae 100644
--- a/openwrt/package/quagga/ipkg/quagga.control
+++ b/openwrt/package/quagga/ipkg/quagga.control
@@ -3,4 +3,5 @@ Priority: optional
 Section: net
 Description: A routing software package that provides TCP/IP
  based routing services with routing protocols support such
- as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+.
+ as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, BGP-4, and BGP-4+
+ IS-IS.