Changeset 8a79a44 in freewrt

Timestamp:

May 17, 2007, 2:37:50 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Children:

2515945

Parents:

2312441

Message:

update to latest upstream, fix build if FWRT_IPV6 is not set

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2527 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/quagga

Files:

• Config.in (modified) (2 diffs)
• Makefile (modified) (3 diffs)
• patches/quagga-readline.patch (deleted)

package/quagga/Config.in

@@ -34 +34 @@
         default n
         depends FWRT_PACKAGE_QUAGGA
+        depends FWRT_IPV6
         help
           An OSPFv3 (IPv6) routing engine for use with Quagga routing software.
@@ -50 +51 @@
         default n
         depends FWRT_PACKAGE_QUAGGA
+        depends FWRT_IPV6
         help
           A RIPNG (IPv6) routing engine for use with Quagga routing software.

package/quagga/Makefile

@@ -8 +8 @@
 
 PKG_NAME:=              quagga
-PKG_VERSION:=           0.98.6
-PKG_RELEASE:=           5
-PKG_MD5SUM:=            b0d4132039953a0214256873b7d23d68
+PKG_VERSION:=           0.99.7
+PKG_RELEASE:=           1
+PKG_MD5SUM:=            f448281c50007408ce92c5d8e2107abc
 PKG_SOURCE_URL:=        http://www.quagga.net/download/ \
                         http://www.de.quagga.net/download/ \
@@ -20 +20 @@
 $(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 $(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+ifeq ($(FWRT_IPV6),y)
 $(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+endif
 $(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_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
@@ -52 +54 @@
         ${CP} ${WRKINST}/usr/lib/libospf.so.* ${IDIR_QUAGGA_OSPFD}/usr/lib/
         ${CP} ${WRKINST}/usr/sbin/ospfd ${IDIR_QUAGGA_OSPFD}/usr/sbin/
+ifeq ($(FWRT_IPV6),y)
         ${INSTALL_DIR} ${IDIR_QUAGGA_OSPF6D}/usr/sbin
         ${CP} ${WRKINST}/usr/sbin/ospf6d ${IDIR_QUAGGA_OSPF6D}/usr/sbin/
+        ${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin
+        ${CP} ${WRKINST}/usr/sbin/ripngd ${IDIR_QUAGGA_RIPNGD}/usr/sbin/
+endif
         ${INSTALL_DIR} ${IDIR_QUAGGA_RIPD}/usr/sbin
         ${CP} ${WRKINST}/usr/sbin/ripd ${IDIR_QUAGGA_RIPD}/usr/sbin/
-        ${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin
-        ${CP} ${WRKINST}/usr/sbin/ripngd ${IDIR_QUAGGA_RIPNGD}/usr/sbin/
         ${INSTALL_DIR} ${IDIR_QUAGGA_VTYSH}/usr/bin
         ${CP} ${WRKINST}/usr/bin/vtysh ${IDIR_QUAGGA_VTYSH}/usr/bin/