quagga: update to 1.0.20160309, add example configs to target

1 files changed, 44 insertions, 37 deletions

diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 0abd8bb58..ba1b936bd 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -1,42 +1,43 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		quagga
-PKG_VERSION:=		0.99.24.1
+PKG_VERSION:=		1.0.20160309
 PKG_RELEASE:=		1
-PKG_HASH:=		6fd6baadb136a801c29c1dd72d0fe69da9f19ae498e87bff7057778361e43b14
+PKG_HASH:=		034e21f87164f44f1c4c89d8fafed4acede298fe3fafbf9277f079544178c66b
 PKG_DESCR:=		routing software package
 PKG_SECTION:=		net/route
 PKG_BUILDDEP:=		readline ncurses
+PKG_NEEDS:=		threads rt
 PKG_URL:=		http://www.quagga.net/
 PKG_SITES:=		http://download.savannah.gnu.org/releases/quagga/
 
 PKG_SUBPKGS:=		QUAGGA QUAGGA_BGPD QUAGGA_OSPFD QUAGGA_OSPF6D
 PKG_SUBPKGS+=		QUAGGA_RIPNGD QUAGGA_RIPD QUAGGA_VTYSH
-PKGSD_QUAGGA_BGPD:=	BGP daemon
+PKGSD_QUAGGA_BGPD:=	bgp daemon
 PKGSN_QUAGGA_BGPD:=	quagga
-PKGSD_QUAGGA_OSPFD:=	OSPF daemon
+PKGSD_QUAGGA_OSPFD:=	ospf daemon
 PKGSN_QUAGGA_OSPFD:=	quagga
-PKGSD_QUAGGA_OSPF6D:=	OSPF IPv6 daemon
+PKGSD_QUAGGA_OSPF6D:=	ospf ipv6 daemon
 PKGSN_QUAGGA_OSPF6D:=	quagga
-PKGSD_QUAGGA_RIPNGD:=	RIPng daemon
+PKGSD_QUAGGA_RIPNGD:=	ripng daemon
 PKGSN_QUAGGA_RIPNGD:=	quagga
-PKGSD_QUAGGA_RIPD:=	RIP daemon
+PKGSD_QUAGGA_RIPD:=	rip daemon
 PKGSN_QUAGGA_RIPD:=	quagga
 PKGSD_QUAGGA_VTYSH:=	vtysh utility
 PKGSN_QUAGGA_VTYSH:=	quagga
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,QUAGGA,quagga,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_BGPD},${PKG_SECTION}))
-$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_OSPFD},${PKG_SECTION}))
-$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_OSPF6D},${PKG_SECTION}))
-$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_RIPNGD},${PKG_SECTION}))
-$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_RIPD},${PKG_SECTION}))
-$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_QUAGGA_VTYSH},${PKG_SECTION}))
+$(eval $(call PKG_template,QUAGGA,quagga,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,QUAGGA_BGPD,quagga-bgpd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_BGPD),$(PKG_SECTION)))
+$(eval $(call PKG_template,QUAGGA_OSPFD,quagga-ospfd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_OSPFD),$(PKG_SECTION)))
+$(eval $(call PKG_template,QUAGGA_OSPF6D,quagga-ospf6d,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_OSPF6D),$(PKG_SECTION)))
+$(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_RIPNGD),$(PKG_SECTION)))
+$(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_RIPD),$(PKG_SECTION)))
+$(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_QUAGGA_VTYSH),$(PKG_SECTION)))
 
 CONFIGURE_ENV+=		quagga_cv_ipforward_method="proc"
 CONFIGURE_ARGS+=	--localstatedir=/var/run/quagga \
@@ -50,37 +51,43 @@ CONFIGURE_ARGS+=	--localstatedir=/var/run/quagga \
 			--enable-multipath=8
 
 quagga-install:
-	${INSTALL_DIR} ${IDIR_QUAGGA}/usr/{lib,sbin}
-	${CP} ${WRKINST}/usr/lib/libzebra.so.* ${IDIR_QUAGGA}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/zebra \
-		${WRKINST}/usr/sbin/watchquagga ${IDIR_QUAGGA}/usr/sbin/
-	# avoid /etc being set to 0750
-	${INSTALL_DIR} ${IDIR_QUAGGA}/etc/quagga/
-	chmod 0750 ${IDIR_QUAGGA}/etc/quagga/
+	$(INSTALL_DIR) $(IDIR_QUAGGA)/etc/quagga
+	$(INSTALL_DIR) $(IDIR_QUAGGA)/usr/lib
+	$(INSTALL_DIR) $(IDIR_QUAGGA)/usr/sbin
+	$(CP) $(WRKINST)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/zebra \
+		$(WRKINST)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/
+	$(CP) $(WRKINST)/etc/quagga/zebra.conf.sample \
+		$(IDIR_QUAGGA)/etc/quagga/zebra.conf
 
 quagga-bgpd-install:
-	${INSTALL_DIR} ${IDIR_QUAGGA_BGPD}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/bgpd ${IDIR_QUAGGA_BGPD}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_QUAGGA_BGPD)/usr/sbin
+	$(CP) $(WRKINST)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/
+	$(CP) $(WRKINST)/etc/quagga/bgpd.conf.sample \
+		$(IDIR_QUAGGA)/etc/quagga/bgpd.conf
 
 quagga-ospfd-install:
-	${INSTALL_DIR} ${IDIR_QUAGGA_OSPFD}/usr/{lib,sbin}
-	${CP} ${WRKINST}/usr/lib/libospf.so.* ${IDIR_QUAGGA_OSPFD}/usr/lib/
-	${CP} ${WRKINST}/usr/sbin/ospfd ${IDIR_QUAGGA_OSPFD}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_QUAGGA_OSPFD)/usr/lib
+	$(INSTALL_DIR) $(IDIR_QUAGGA_OSPFD)/usr/sbin
+	$(CP) $(WRKINST)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/
+	$(CP) $(WRKINST)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/
+	$(CP) $(WRKINST)/etc/quagga/ospfd.conf.sample \
+		$(IDIR_QUAGGA)/etc/quagga/ospfd.conf
 
 quagga-ospf6d-install:
-	${INSTALL_DIR} ${IDIR_QUAGGA_OSPF6D}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/ospf6d ${IDIR_QUAGGA_OSPF6D}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_QUAGGA_OSPF6D)/usr/sbin
+	$(CP) $(WRKINST)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/
 
 quagga-ripngd-install:
-	${INSTALL_DIR} ${IDIR_QUAGGA_RIPNGD}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/ripngd ${IDIR_QUAGGA_RIPNGD}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_QUAGGA_RIPNGD)/usr/sbin
+	$(CP) $(WRKINST)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/
 
 quagga-ripd-install:
-	${INSTALL_DIR} ${IDIR_QUAGGA_RIPD}/usr/sbin
-	${CP} ${WRKINST}/usr/sbin/ripd ${IDIR_QUAGGA_RIPD}/usr/sbin/
+	$(INSTALL_DIR) $(IDIR_QUAGGA_RIPD)/usr/sbin
+	$(CP) $(WRKINST)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/
 
 quagga-vtysh-install:
-	${INSTALL_DIR} ${IDIR_QUAGGA_VTYSH}/usr/bin
-	${CP} ${WRKINST}/usr/bin/vtysh ${IDIR_QUAGGA_VTYSH}/usr/bin/
+	$(INSTALL_DIR) $(IDIR_QUAGGA_VTYSH)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk