* iproute2

	 - clean up rule file
	 - arpd only on demand
	 - some help text added


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10556 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 64 insertions, 53 deletions

diff --git a/patches/iproute2-2.6.29-1/generic/remove_arpd.diff b/patches/iproute2-2.6.29-1/generic/remove_arpd.diff
new file mode 100644
index 000000000..185f66eee
--- /dev/null
+++ b/patches/iproute2-2.6.29-1/generic/remove_arpd.diff
@@ -0,0 +1,42 @@
+Subject: Make the buildsystem be gracious to us.
+
+Signed-off-by: Juergen Beisert juergen@kreuzholzen.de
+
+---
+ Makefile      |    2 +-
+ misc/Makefile |    6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+Index: misc/Makefile
+===================================================================
+--- misc/Makefile.orig
++++ misc/Makefile
+@@ -1,10 +1,14 @@
+ SSOBJ=ss.o ssfilter.o
+ LNSTATOBJ=lnstat.o lnstat_util.o
+ 
+-TARGETS=ss nstat ifstat rtacct arpd lnstat
++TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../Config
+ 
++ifdef BUILD_ARPD
++TARGETS += arpd
++endif
++
+ all: $(TARGETS)
+ 
+ ss: $(SSOBJ) $(LIBUTIL)
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -23,7 +23,7 @@ ADDLIB+=ipx_ntop.o ipx_pton.o
+ CC = gcc
+ HOSTCC = gcc
+ CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
+-CFLAGS = $(CCOPTS) -I../include $(DEFINES)
++CFLAGS = $(CROSS_CPPFLAGS) $(CCOPTS) -I../include $(DEFINES)
+ YACCFLAGS = -d -t -v
+ 
+ LDLIBS += -L../lib -lnetlink -lutil
diff --git a/patches/iproute2-2.6.29-1/generic/series b/patches/iproute2-2.6.29-1/generic/series
new file mode 100644
index 000000000..1d4b02531
--- /dev/null
+++ b/patches/iproute2-2.6.29-1/generic/series
@@ -0,0 +1,2 @@
+remove_arpd.diff -p0
+fix_missing_RTPROT_DHCP.diff
diff --git a/rules/iproute2.in b/rules/iproute2.in
index b8fa7a194..e0ff4dbc4 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -1,8 +1,7 @@
 ## SECTION=networking
-
 menuconfig IPROUTE2
 	tristate
-	prompt "iproute2"
+	prompt "iproute2                      "
 	select DB if IPROUTE2_ARPD
 	select LIBC_DL
 	select LIBC_M
@@ -27,8 +26,10 @@ config IPROUTE2_TC
 
 config IPROUTE2_ARPD
 	bool
-	select DB_44
 	prompt "arpd"
+	help
+	  Enabling this extry will enlarge your system by the berkely
+	  DB4.x library.
 
 config IPROUTE2_LNSTAT
 	bool
@@ -47,4 +48,3 @@ config IPROUTE2_SS
 	prompt "ss"
 
 endif
-
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 64d9bf023..5c10ee7b5 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -2,6 +2,7 @@
 # $Id: template 5616 2006-06-02 13:50:47Z rsc $
 #
 # Copyright (C) 2006 by Erwin Rol
+# Copyright (C) 2009 by Robert Schwebel/Juergen Beisert
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -28,68 +29,35 @@ IPROUTE2_DIR		:= $(BUILDDIR)/$(IPROUTE2)
 # Get
 # ----------------------------------------------------------------------------
 
-iproute2_get: $(STATEDIR)/iproute2.get
-
-$(STATEDIR)/iproute2.get: $(iproute2_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(IPROUTE2_SOURCE):
 	@$(call targetinfo, $@)
 	@$(call get, IPROUTE2)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-iproute2_extract: $(STATEDIR)/iproute2.extract
-
-$(STATEDIR)/iproute2.extract: $(iproute2_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(IPROUTE2_DIR))
-	@$(call extract, IPROUTE2)
-	@$(call patchin, IPROUTE2)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-iproute2_prepare: $(STATEDIR)/iproute2.prepare
-
 IPROUTE2_PATH	:=  PATH=$(CROSS_PATH)
 IPROUTE2_ENV 	:=  $(CROSS_ENV)
-IPROUTE2_MAKEVARS = $(call remove_quotes, $(CROSS_ENV_CC) CFLAGS='$(CROSS_CPPFLAGS) -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I../include -DRESOLVE_HOSTNAMES' LDFLAGS='$(CROSS_LDFLAGS) -L../lib -lnetlink -lutil' DBM_INCLUDE=$(SYSROOT)/usr/include)
-
-#
-# autoconf
-#
-IPROUTE2_AUTOCONF := $(CROSS_AUTOCONF_USR)
+IPROUTE2_MAKEVARS = \
+	CC=$(PTXCONF_GNU_TARGET)-gcc \
+	CROSS_CPPFLAGS='$(CROSS_CPPFLAGS) ' \
+	LDFLAGS='$(CROSS_LDFLAGS)' \
+	DBM_INCLUDE=$(SYSROOT)/usr/include
 
-$(STATEDIR)/iproute2.prepare: $(iproute2_prepare_deps_default)
+$(STATEDIR)/iproute2.prepare:
 	@$(call targetinfo, $@)
-	@$(call clean, $(IPROUTE2_DIR)/config.cache)
-	touch $(IPROUTE2_DIR)/Config
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-iproute2_compile: $(STATEDIR)/iproute2.compile
-
-$(STATEDIR)/iproute2.compile: $(iproute2_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(IPROUTE2_DIR) && $(IPROUTE2_PATH) make $(IPROUTE2_MAKEVARS)
+	@touch $(IPROUTE2_DIR)/Config
+ifdef PTXCONF_IPROUTE2_ARPD
+	@echo BUILD_ARPD=y >> $(IPROUTE2_DIR)/Config
+endif
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-iproute2_install: $(STATEDIR)/iproute2.install
-
-$(STATEDIR)/iproute2.install: $(iproute2_install_deps_default)
+$(STATEDIR)/iproute2.install:
 	@$(call targetinfo, $@)
 	@$(call touch, $@)
 
@@ -97,9 +65,7 @@ $(STATEDIR)/iproute2.install: $(iproute2_install_deps_default)
 # Target-Install
 # ----------------------------------------------------------------------------
 
-iproute2_targetinstall: $(STATEDIR)/iproute2.targetinstall
-
-$(STATEDIR)/iproute2.targetinstall: $(iproute2_targetinstall_deps_default)
+$(STATEDIR)/iproute2.targetinstall:
 	@$(call targetinfo, $@)
 
 	@$(call install_init, iproute2)
@@ -107,7 +73,7 @@ $(STATEDIR)/iproute2.targetinstall: $(iproute2_targetinstall_deps_default)
 	@$(call install_fixup,iproute2,PRIORITY,optional)
 	@$(call install_fixup,iproute2,VERSION,$(IPROUTE2_VERSION))
 	@$(call install_fixup,iproute2,SECTION,base)
-	@$(call install_fixup,iproute2,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,iproute2,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup,iproute2,DEPENDS,)
 	@$(call install_fixup,iproute2,DESCRIPTION,missing)
 
@@ -128,7 +94,8 @@ ifdef PTXCONF_IPROUTE2_TC
 	@$(call install_copy, iproute2, 0, 0, 0755, \
 		$(IPROUTE2_DIR)/netem/normal.dist, \
 		/usr/lib/tc/normal.dist,n)
-
+endif
+ifdef PTXCONF_IPROUTE2_ARPD
 	@$(call install_copy, iproute2, 0, 0, 0755, \
 		$(IPROUTE2_DIR)/netem/pareto.dist, \
 		/usr/lib/tc/pareto.dist,n)