Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

7 files changed, 74 insertions, 87 deletions

diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in
deleted file mode 100644
index d431a5293..000000000
--- a/package/iproute2/Config.in
+++ /dev/null
@@ -1,79 +0,0 @@
-config ADK_COMPILE_IPROUTE2
-	prompt   "iproute2.......................... iproute2 suite of networking utilities"
-	tristate
-	default n
-
-config ADK_PACKAGE_IP
-	prompt   "ip................................ ip utility"
-	tristate
-	default ADK_COMPILE_IPROUTE2
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  IP routing control utility, well-known replacement for ifconfig and route.
-
-config ADK_PACKAGE_TC
-	prompt   "tc................................ tc utility"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	 Traffic shaping control utility. Please choose the kmod-sched-* modules
-	 you need.
-
-config ADK_PACKAGE_TC_ATM
-	prompt   "atm support....................... atm support for tc"
-	tristate
-	default n
-	depends on ADK_PACKAGE_TC
-	select ADK_PACKAGE_LIBATM
-	help
-	  ATM traffic control support library.
-
-# FIXME: WTF is this "genl" used for??
-# "ifcfg" is lame, just a simple 'ip addr {add|del}' frontend
-
-config ADK_PACKAGE_IFSTAT
-	prompt   "ifstat............................ ifstat utility"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  Interface statistics utility.
-
-config ADK_PACKAGE_LNSTAT
-	prompt   "lnstat............................ lnstat, ctstat, rtstat, nstat and rtacct utilities"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  Unified linux networking statistics. Lnstat is a replacement for the
-	  old rstat program, nstat and rtacct are simple tools to monitor
-	  kernel snmp counters and network interface statistics.
-
-
-config ADK_PACKAGE_ROUTEL
-	prompt   "routel............................ routel/routef utilities"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  List and flush routes.
-
-config ADK_PACKAGE_RTMON
-	prompt   "rtmon............................. RTnetlink monitor"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  Listen to and monitor RTnetlink.
-
-# "rtpr" converts back the output of 'ip -o' (quite useless I guess)
-
-config ADK_PACKAGE_SS
-	prompt   "ss................................ socket statistics utility"
-	tristate
-	default m
-	depends on ADK_COMPILE_IPROUTE2
-	help
-	  A utility to investigate sockets, similar to netstat.
-
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 5195693c0..f65a61e2c 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -9,13 +9,16 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		c1bc258a6c345905e79935ac7a3cc582
 PKG_DESCR:=		iproute2 routing control utility
 PKG_SECTION:=		net
+ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
+PKG_BUILDDEP+=		linux-atm
+endif
 PKG_URL:=		http://www.linuxfoundation.org/en/Net:Iproute2
 PKG_SITES:=		http://developer.osdl.org/dev/iproute2/download/
 
 PKG_DESCR_TC:=		iproute2 traffic control utility
 PKG_DEPENDS_TC:=	kmod-sched
 PKG_DESCR_TC_ATM:=	iproute2 traffic control ATM support library
-PKG_DEPENDS_TC_ATM:=	tc
+PKG_DEPENDS_TC_ATM:=	tc libatm
 PKG_DESCR_IFSTAT:=	iproute2 interface statistics utility
 PKG_DESCR_LNSTAT:=	iproute2 network statistics utilities
 PKG_DESCR_ROUTEL:=	iproute2 route list and flush utilities
@@ -35,11 +38,11 @@ $(eval $(call PKG_template,ROUTEL,routel,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,RTMON,rtmon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_RTMON},${PKG_DESCR_RTMON},${PKG_SECTION}))
 $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SS},${PKG_DESCR_SS},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+TCFLAGS+=		-D_GNU_SOURCE
+XAKE_FLAGS+=		CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \
+			HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include"
+
 CONFIGURE_FLAGS+=	KERNEL_INCLUDE="${LINUX_DIR}/include"
-MAKE_FLAGS+=		MFLAGS="CC=${TARGET_CC}"
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 INSTALL_y:=
 INSTALL_m:=
@@ -66,7 +69,8 @@ install-tc:
 
 install-tc-atm:
 	${INSTALL_DIR} ${IDIR_TC_ATM}/usr/lib/tc
-	${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so ${IDIR_TC_ATM}/usr/lib/tc/
+	${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so \
+		${IDIR_TC_ATM}/usr/lib/tc/
 
 install-ifstat:
 	${INSTALL_DIR} ${IDIR_IFSTAT}/usr/sbin
diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile
index 194162a87..841c6f32e 100644
--- a/package/iproute2/patches/patch-Makefile
+++ b/package/iproute2/patches/patch-Makefile
@@ -4,7 +4,7 @@
 	  used to compile host-utils in netem/
 	- define LIBUTIL for misc/ss to compile correctly
 --- iproute2-2.6.29-1.orig/Makefile	2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/Makefile	2009-08-22 02:42:31.939603104 +0200
++++ iproute2-2.6.29-1/Makefile	2009-11-25 08:59:58.000000000 +0100
 @@ -20,10 +20,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o
  #options for ipx
  ADDLIB+=ipx_ntop.o ipx_pton.o
@@ -15,7 +15,7 @@
 -CFLAGS = $(CCOPTS) -I../include $(DEFINES)
 +CC := gcc
 +HOSTCC := gcc
-+CCOPTS := -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
++CCOPTS ?= -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
 +CFLAGS = $(CCOPTS) -I../include $(DEFINES) ${TARGET_CFLAGS}
  YACCFLAGS = -d -t -v
  
diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile
new file mode 100644
index 000000000..325d01925
--- /dev/null
+++ b/package/iproute2/patches/patch-netem_Makefile
@@ -0,0 +1,27 @@
+--- iproute2-2.6.29-1.orig/netem/Makefile	2009-03-24 23:40:54.000000000 +0100
++++ iproute2-2.6.29-1/netem/Makefile	2009-12-11 16:39:15.000000000 +0100
+@@ -2,13 +2,13 @@ DISTGEN = maketable normal pareto pareto
+ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+ 
+ HOSTCC ?= $(CC)
+-CCOPTS  = $(CBUILD_CFLAGS)
++HOSTCFLAGS ?= 
+ LDLIBS += -lm 
+ 
+ all: $(DISTGEN) $(DISTDATA)
+ 
+ $(DISTGEN):
+-	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
++	$(HOSTCC) $(HOSTCFLAGS) -I../include -o $@ $@.c -lm
+ 
+ %.dist: %
+ 	./$* > $@
+@@ -17,7 +17,7 @@ experimental.dist: maketable experimenta
+ 	./maketable experimental.dat > experimental.dist
+ 
+ stats: stats.c
+-	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
++	$(HOSTCC) $(HOSTCFLAGS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+ 	mkdir -p $(DESTDIR)/lib/tc
diff --git a/package/iproute2/patches/patch-netem_maketable_c b/package/iproute2/patches/patch-netem_maketable_c
new file mode 100644
index 000000000..b6eb03405
--- /dev/null
+++ b/package/iproute2/patches/patch-netem_maketable_c
@@ -0,0 +1,11 @@
+--- iproute2-2.6.29-1.orig/netem/maketable.c	2009-03-24 23:40:54.000000000 +0100
++++ iproute2-2.6.29-1/netem/maketable.c	2009-12-11 16:32:33.000000000 +0100
+@@ -10,7 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/package/iproute2/patches/patch-netem_normal_c b/package/iproute2/patches/patch-netem_normal_c
new file mode 100644
index 000000000..719899301
--- /dev/null
+++ b/package/iproute2/patches/patch-netem_normal_c
@@ -0,0 +1,10 @@
+--- iproute2-2.6.29-1.orig/netem/normal.c	2009-03-24 23:40:54.000000000 +0100
++++ iproute2-2.6.29-1/netem/normal.c	2009-12-11 16:35:38.000000000 +0100
+@@ -8,7 +8,6 @@
+ #include <string.h>
+ #include <limits.h>
+ 
+-#include <linux/types.h>
+ #include <linux/pkt_sched.h>
+ 
+ #define TABLESIZE 16384
diff --git a/package/iproute2/patches/patch-netem_paretonormal_c b/package/iproute2/patches/patch-netem_paretonormal_c
new file mode 100644
index 000000000..d2c2ac4b6
--- /dev/null
+++ b/package/iproute2/patches/patch-netem_paretonormal_c
@@ -0,0 +1,14 @@
+--- iproute2-2.6.29-1.orig/netem/paretonormal.c	2009-03-24 23:40:54.000000000 +0100
++++ iproute2-2.6.29-1/netem/paretonormal.c	2009-12-11 16:59:02.000000000 +0100
+@@ -11,11 +11,9 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+ #include <limits.h>
+-#include <malloc.h>
+ 
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>