[Astlinux-commits] SF.net SVN: astlinux: [782] trunk

[<kr...@us...>]

Revision: 782
          http://svn.sourceforge.net/astlinux/?rev=782&view=rev
Author:   krisk84
Date:     2007-03-17 17:10:36 -0700 (Sat, 17 Mar 2007)

Log Message:
-----------
quagga routing daemon support

Modified Paths:
--------------
    trunk/astlinux.config
    trunk/package/Config.in

Added Paths:
-----------
    trunk/package/quagga/
    trunk/package/quagga/Config.in
    trunk/package/quagga/Makefile.in
    trunk/package/quagga/quagga-cross.patch
    trunk/package/quagga/quagga-readline.patch
    trunk/package/quagga/quagga.mk

Modified: trunk/astlinux.config
===================================================================
--- trunk/astlinux.config	2007-03-17 18:38:41 UTC (rev 781)
+++ trunk/astlinux.config	2007-03-18 00:10:36 UTC (rev 782)
@@ -318,6 +318,7 @@
 # BR2_PACKAGE_PYTHON is not set
 # BR2_PACKAGE_QTE is not set
 BR2_QTE_TMAKE_VERSION="1.13"
+# BR2_PACKAGE_QUAGGA is not set
 # BR2_PACKAGE_RAIDTOOLS is not set
 # BR2_READLINE is not set
 # BR2_PACKAGE_RESCONV is not set

Modified: trunk/package/Config.in
===================================================================
--- trunk/package/Config.in	2007-03-17 18:38:41 UTC (rev 781)
+++ trunk/package/Config.in	2007-03-18 00:10:36 UTC (rev 782)
@@ -152,6 +152,7 @@
 source "package/psmisc/Config.in"
 source "package/python/Config.in"
 source "package/qte/Config.in"
+source "package/quagga/Config.in"
 source "package/raidtools/Config.in"
 source "package/readline/Config.in"
 source "package/resconv/Config.in"

Added: trunk/package/quagga/Config.in
===================================================================
--- trunk/package/quagga/Config.in	                        (rev 0)
+++ trunk/package/quagga/Config.in	2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_QUAGGA
+	bool "quagga"
+	default n
+	help
+		Quagga Routing Software Suite, GPL licensed IPv4/IPv6 routing  
+		software.
+
+		zebra is a routing manager that implements the zebra route
+		engine.  zebra supports RIPv1, RIPv2, RIPng, OSPF,  OSPF6,
+		BGP4+, and BGP4-.
+
+		Quagga is free software that manages various IPv4 and IPv6 routing
+		protocols.
+
+		Currently Quagga supports BGP4, BGP4+, OSPFv2, OSPFv3, RIPv1,
+		RIPv2, and RIPng.
+		  
+		http://www.quagga.net

Added: trunk/package/quagga/Makefile.in
===================================================================
--- trunk/package/quagga/Makefile.in	                        (rev 0)
+++ trunk/package/quagga/Makefile.in	2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,3 @@
+ifeq ($(strip $(BR2_PACKAGE_QUAGGA)),y)
+TARGETS+=quagga
+endif

Added: trunk/package/quagga/quagga-cross.patch
===================================================================
--- trunk/package/quagga/quagga-cross.patch	                        (rev 0)
+++ trunk/package/quagga/quagga-cross.patch	2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,84 @@
+--- quagga-0.98.4/configure.orig	Mon Jun 27 19:05:31 2005
++++ quagga-0.98.4/configure	Mon Jul 11 20:32:07 2005
+@@ -12623,69 +12623,6 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for broken CMSG_FIRSTHDR" >&5
+-echo $ECHO_N "checking for broken CMSG_FIRSTHDR... $ECHO_C" >&6
+-if test "$cross_compiling" = yes; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-#ifdef SUNOS_5
+-#define _XPG4_2
+-#define __EXTENSIONS__
+-#endif
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-
+-main()
+-{
+-  struct msghdr msg;
+-  char buf[4];
+-
+-  msg.msg_control = buf;
+-  msg.msg_controllen = 0;
+-
+-  if (CMSG_FIRSTHDR(&msg) != NULL)
+-    exit(0);
+-  exit (1);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  echo "$as_me:$LINENO: result: yes - using workaround" >&5
+-echo "${ECHO_T}yes - using workaround" >&6
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BROKEN_CMSG_FIRSTHDR
+-_ACEOF
+-
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+ echo "$as_me:$LINENO: checking route read method check" >&5
+ echo $ECHO_N "checking route read method check... $ECHO_C" >&6
+ if test "${zebra_rtread+set}" = set; then
+@@ -12783,10 +12720,7 @@
+ if test "${zebra_ipforward_path+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  for zebra_ipforward_path in /proc/net/snmp /dev/ip /dev/null;
+-do
+-  test x`ls $zebra_ipforward_path 2>/dev/null` = x"$zebra_ipforward_path" && break
+-done
++  zebra_ipforward_path="/proc/net/snmp"
+ case $zebra_ipforward_path in
+   "/proc/net/snmp")  IPFORWARD=ipforward_proc.o
+                      zebra_ipforward_path="proc";;

Added: trunk/package/quagga/quagga-readline.patch
===================================================================
--- trunk/package/quagga/quagga-readline.patch	                        (rev 0)
+++ trunk/package/quagga/quagga-readline.patch	2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,58 @@
+--- quagga-0.98.4/configure.orig	Mon Jun 27 19:05:31 2005
++++ quagga-0.98.4/configure	Thu Jul 28 07:02:12 2005
+@@ -10937,7 +10937,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcurses  $LIBS"
++#LIBS="-lcurses  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11071,7 +11071,8 @@
+ #define HAVE_LIBNCURSES 1
+ _ACEOF
+ 
+-  LIBS="-lncurses $LIBS"
++#  LIBS="-lncurses $LIBS"
++CURSES=-lncurses
+ 
+ fi
+ 
+@@ -11088,7 +11089,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline  $LIBS"
++LIBS="-lreadline $CURSES $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11144,7 +11145,8 @@
+ #define HAVE_LIBREADLINE 1
+ _ACEOF
+ 
+-  LIBS="-lreadline $LIBS"
++#  LIBS="-lreadline $LIBS"
++CURSES="$CURSES -lreadline"
+ 
+ fi
+ 
+@@ -11303,7 +11305,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline  $LIBS"
++LIBS="-lreadline $CURSES $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -11365,7 +11367,7 @@
+ #define HAVE_LIBREADLINE 1
+ _ACEOF
+ 
+-  LIBS="-lreadline $LIBS"
++#  LIBS="-lreadline $LIBS"
+ 
+ fi
+ 

Added: trunk/package/quagga/quagga.mk
===================================================================
--- trunk/package/quagga/quagga.mk	                        (rev 0)
+++ trunk/package/quagga/quagga.mk	2007-03-18 00:10:36 UTC (rev 782)
@@ -0,0 +1,95 @@
+#############################################################
+#
+# quagga
+#
+#############################################################
+QUAGGA_VERSION:=0.98.6
+QUAGGA_URL:=http://www.quagga.net/download/
+QUAGGA_DIR:=$(BUILD_DIR)/quagga-$(QUAGGA_VERSION)
+QUAGGA_SOURCE:=quagga-$(QUAGGA_VERSION).tar.gz
+
+$(DL_DIR)/$(QUAGGA_SOURCE):
+	$(WGET) -P $(DL_DIR) $(QUAGGA_URL)/$(QUAGGA_SOURCE)
+
+$(QUAGGA_DIR)/.unpacked: $(DL_DIR)/$(QUAGGA_SOURCE)
+	zcat $(DL_DIR)/$(QUAGGA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(QUAGGA_DIR) package/quagga quagga\*.patch
+	touch  $(QUAGGA_DIR)/.unpacked
+
+$(QUAGGA_DIR)/.configured: $(QUAGGA_DIR)/.unpacked
+	(cd $(QUAGGA_DIR); rm -rf config.{cache,status}; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--program-prefix="" \
+		--program-suffix="" \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--datadir=/usr/share \
+		--includedir=/usr/include \
+		--infodir=/usr/share/info \
+		--libdir=/usr/lib \
+		--libexecdir=/usr/lib \
+		--localstatedir=/var/run/quagga \
+		--mandir=/usr/share/man \
+		--sbindir=/usr/sbin \
+		--sysconfdir=/etc/quagga \
+		$(DISABLE_NLS) \
+		--enable-shared \
+		--disable-static \
+		--disable-ipv6 \
+		--disable-vtysh \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-multipath=8 \
+		--enable-isisd \
+        );
+	touch  $(QUAGGA_DIR)/.configured
+
+$(QUAGGA_DIR)/zebra/zebra: $(QUAGGA_DIR)/.configured
+	$(MAKE) -C $(QUAGGA_DIR) DESTDIR=$(STAGING_DIR) all
+
+$(STAGING_DIR)/usr/sbin/zebra: $(QUAGGA_DIR)/zebra/zebra
+	$(MAKE1) -C $(QUAGGA_DIR) DESTDIR=$(STAGING_DIR) install
+
+$(TARGET_DIR)/usr/sbin/zebra: $(STAGING_DIR)/usr/sbin/zebra
+	cp -a $(STAGING_DIR)/usr/lib/libzebra.so* $(TARGET_DIR)/usr/lib/
+	cp -a $(STAGING_DIR)/usr/lib/libospf.so* $(TARGET_DIR)/usr/lib/
+	-$(STRIP) $(TARGET_DIR)/usr/lib/libzebra.so* $(TARGET_DIR)/usr/lib/libospf.so*
+	$(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/bgpd $(TARGET_DIR)/usr/sbin/bgpd
+	$(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/ripd $(TARGET_DIR)/usr/sbin/ripd
+	$(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/ospfd $(TARGET_DIR)/usr/sbin/ospfd
+	$(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/isisd $(TARGET_DIR)/usr/sbin/isisd
+	$(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/sbin/zebra $(TARGET_DIR)/usr/sbin/zebra
+	touch -c $(TARGET_DIR)/usr/sbin/zebra
+
+quagga: uclibc $(TARGET_DIR)/usr/sbin/zebra
+
+quagga-source: $(DL_DIR)/$(QUAGGA_SOURCE)
+
+quagga-patch: $(QUAGGA_DIR)/.unpacked
+
+quagga-clean: 
+	-$(MAKE) -C $(QUAGGA_DIR) clean
+	-rm -f $(TARGET_DIR)/usr/sbin/zebra
+	-rm -f $(TARGET_DIR)/usr/lib/libospf*
+	-rm -f $(TARGET_DIR)/usr/lib/libzebra*
+
+quagga-dirclean: 
+	rm -rf $(QUAGGA_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_QUAGGA)),y)
+TARGETS+=quagga
+endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.