Changeset 2527

Show
Ignore:
Timestamp:
05/17/07 14:37:50 (2 years ago)
Author:
wbx
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/quagga/Config.in

    r1253 r2527  
    3434        default n 
    3535        depends FWRT_PACKAGE_QUAGGA 
     36        depends FWRT_IPV6 
    3637        help 
    3738          An OSPFv3 (IPv6) routing engine for use with Quagga routing software. 
    …… 
    5051        default n 
    5152        depends FWRT_PACKAGE_QUAGGA 
     53        depends FWRT_IPV6 
    5254        help 
    5355          A RIPNG (IPv6) routing engine for use with Quagga routing software. 

  • trunk/freewrt/package/quagga/Makefile

    r2519 r2527  
    88 
    99PKG_NAME:=              quagga 
    10 PKG_VERSION:=           0.98.6 
    11 PKG_RELEASE:=           5 
    12 PKG_MD5SUM:=            b0d4132039953a0214256873b7d23d68 
     10PKG_VERSION:=           0.99.7 
     11PKG_RELEASE:=           1 
     12PKG_MD5SUM:=            f448281c50007408ce92c5d8e2107abc 
    1313PKG_SOURCE_URL:=        http://www.quagga.net/download/ \ 
    1414                        http://www.de.quagga.net/download/ \ 
    …… 
    2020$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    2121$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
     22ifeq ($(FWRT_IPV6),y) 
    2223$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
     24$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
     25endif 
    2326$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    24 $(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    2527$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    2628 
    …… 
    5254        ${CP} ${WRKINST}/usr/lib/libospf.so.* ${IDIR_QUAGGA_OSPFD}/usr/lib/ 
    5355        ${CP} ${WRKINST}/usr/sbin/ospfd ${IDIR_QUAGGA_OSPFD}/usr/sbin/ 
     56ifeq ($(FWRT_IPV6),y) 
    5457        ${INSTALL_DIR} ${IDIR_QUAGGA_OSPF6D}/usr/sbin 
    5558        ${CP} ${WRKINST}/usr/sbin/ospf6d ${IDIR_QUAGGA_OSPF6D}/usr/sbin/ 
     59        ${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin 
     60        ${CP} ${WRKINST}/usr/sbin/ripngd ${IDIR_QUAGGA_RIPNGD}/usr/sbin/ 
     61endif 
    5662        ${INSTALL_DIR} ${IDIR_QUAGGA_RIPD}/usr/sbin 
    5763        ${CP} ${WRKINST}/usr/sbin/ripd ${IDIR_QUAGGA_RIPD}/usr/sbin/ 
    58         ${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin 
    59         ${CP} ${WRKINST}/usr/sbin/ripngd ${IDIR_QUAGGA_RIPNGD}/usr/sbin/ 
    6064        ${INSTALL_DIR} ${IDIR_QUAGGA_VTYSH}/usr/bin 
    6165        ${CP} ${WRKINST}/usr/bin/vtysh ${IDIR_QUAGGA_VTYSH}/usr/bin/