fix ar7 image builder

[openwrt.git] / package / quagga / Makefile

diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 32d6d66..8b85555 100644 (file)
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quagga

-PKG_VERSION:=0.98.4
+PKG_VERSION:=0.98.5

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=c68e409931449afc5730289d3105f502
+PKG_MD5SUM:=ec09c1ec624aea98e18aa19282666784

 
 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \
 
 PKG_SOURCE_URL:=http://www.quagga.net/download/ \
                 http://www.de.quagga.net/download/ \


@@ -60,6 +60,7 @@ $(PKG_BUILD_DIR)/.configured:
                --enable-vtysh \
                --enable-user=quagga \
                --enable-group=quagga \
                --enable-vtysh \
                --enable-user=quagga \
                --enable-group=quagga \

+               --enable-multipath=8 \

        );
        touch $@
 
        );
        touch $@
 


@@ -71,53 +72,54 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_QUAGGA):
        install -d -m0755 $(IDIR_QUAGGA)/usr/lib
 
 $(IPKG_QUAGGA):
        install -d -m0755 $(IDIR_QUAGGA)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/

        install -d -m0755 $(IDIR_QUAGGA)/usr/sbin
        install -d -m0755 $(IDIR_QUAGGA)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/

        # avoid /etc being set to 0750
        install -d -m0755 $(IDIR_QUAGGA)/etc/quagga/
        chmod 0750 $(IDIR_QUAGGA)/etc/quagga/
        install -d -m0755 $(IDIR_QUAGGA)/etc/init.d/
        install -m0755 ./files/quagga.init $(IDIR_QUAGGA)/etc/init.d/quagga
        ln -sf quagga $(IDIR_QUAGGA)/etc/init.d/S49quagga
        # avoid /etc being set to 0750
        install -d -m0755 $(IDIR_QUAGGA)/etc/quagga/
        chmod 0750 $(IDIR_QUAGGA)/etc/quagga/
        install -d -m0755 $(IDIR_QUAGGA)/etc/init.d/
        install -m0755 ./files/quagga.init $(IDIR_QUAGGA)/etc/init.d/quagga
        ln -sf quagga $(IDIR_QUAGGA)/etc/init.d/S49quagga

+       install -d -m0755 $(IDIR_QUAGGA)/var/run/quagga

        $(RSTRIP) $(IDIR_QUAGGA)
        $(IPKG_BUILD) $(IDIR_QUAGGA) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_BGPD):
        install -d -m0755 $(IDIR_QUAGGA_BGPD)/usr/sbin
        $(RSTRIP) $(IDIR_QUAGGA)
        $(IPKG_BUILD) $(IDIR_QUAGGA) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_BGPD):
        install -d -m0755 $(IDIR_QUAGGA_BGPD)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/

        $(RSTRIP) $(IDIR_QUAGGA_BGPD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_OSPFD):
        install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/lib
        $(RSTRIP) $(IDIR_QUAGGA_BGPD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_OSPFD):
        install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/

        install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/sbin
        install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/

        $(RSTRIP) $(IDIR_QUAGGA_OSPFD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_OSPFD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_OSPF6D):
        install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/sbin
        $(RSTRIP) $(IDIR_QUAGGA_OSPFD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_OSPFD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_OSPF6D):
        install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/

        $(RSTRIP) $(IDIR_QUAGGA_OSPF6D)
        $(IPKG_BUILD) $(IDIR_QUAGGA_OSPF6D) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_RIPD):
        install -d -m0755 $(IDIR_QUAGGA_RIPD)/usr/sbin
        $(RSTRIP) $(IDIR_QUAGGA_OSPF6D)
        $(IPKG_BUILD) $(IDIR_QUAGGA_OSPF6D) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_RIPD):
        install -d -m0755 $(IDIR_QUAGGA_RIPD)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/

        $(RSTRIP) $(IDIR_QUAGGA_RIPD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_RIPD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_RIPNGD):
        install -d -m0755 $(IDIR_QUAGGA_RIPNGD)/usr/sbin
        $(RSTRIP) $(IDIR_QUAGGA_RIPD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_RIPD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_RIPNGD):
        install -d -m0755 $(IDIR_QUAGGA_RIPNGD)/usr/sbin

-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/

        $(RSTRIP) $(IDIR_QUAGGA_RIPNGD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(PACKAGE_DIR)
 
 $(IPKG_QUAGGA_VTYSH):
        install -d -m0755 $(IDIR_QUAGGA_VTYSH)/usr/bin
        $(RSTRIP) $(IDIR_QUAGGA_RIPNGD)
        $(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(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/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/

        $(RSTRIP) $(IDIR_QUAGGA_VTYSH)
        $(IPKG_BUILD) $(IDIR_QUAGGA_VTYSH) $(PACKAGE_DIR)
        $(RSTRIP) $(IDIR_QUAGGA_VTYSH)
        $(IPKG_BUILD) $(IDIR_QUAGGA_VTYSH) $(PACKAGE_DIR)