iproute2: version bump 2.6.39 -> 3.9.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 58 insertions, 89 deletions

diff --git a/patches/iproute2-2.6.39/0001-remove-duplicate-limits.h.patch b/patches/iproute2-2.6.39/0001-remove-duplicate-limits.h.patch
deleted file mode 100644
index f668ed21b..000000000
--- a/patches/iproute2-2.6.39/0001-remove-duplicate-limits.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [iproute2] remove duplicate header file
-
-This patch is already in upstream:
-
-From 52d6a850505d70a699fc89604986c45b0cd0c54e Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen.hemminger@vyatta.com>
-Date: Fri, 27 Mar 2009 11:07:46 -0700
-Subject: [PATCH 03/23] remove duplicate limits.h
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- tc/m_xt.c |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: iproute2-2.6.39/tc/m_xt.c
-===================================================================
---- iproute2-2.6.39.orig/tc/m_xt.c
-+++ iproute2-2.6.39/tc/m_xt.c
-@@ -15,7 +15,6 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <net/if.h>
--#include <limits.h>
- #include <linux/netfilter.h>
- #include <linux/netfilter_ipv4/ip_tables.h>
- #include <xtables.h>
diff --git a/patches/iproute2-2.6.39/0002-remove_arpd.diff b/patches/iproute2-2.6.39/0002-remove_arpd.diff
deleted file mode 100644
index 1c2847b19..000000000
--- a/patches/iproute2-2.6.39/0002-remove_arpd.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Subject: [iproute2] build system fixes
-From: Juergen Beisert <juergen@kreuzholzen.de>
-
-Build arpd only if the user has requested it.
-Add a mechanism to feed in CPPFLAGS for cross builds.
-
-Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- Makefile      |    2 +-
- misc/Makefile |    6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Jon Ringle: refreshed for iproute2-2.6.31
-
-Index: iproute2-2.6.39/misc/Makefile
-===================================================================
---- iproute2-2.6.39.orig/misc/Makefile
-+++ iproute2-2.6.39/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: iproute2-2.6.39/Makefile
-===================================================================
---- iproute2-2.6.39.orig/Makefile
-+++ iproute2-2.6.39/Makefile
-@@ -30,7 +30,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
- 
- SUBDIRS=lib ip tc misc netem genl
diff --git a/patches/iproute2-2.6.39/series b/patches/iproute2-2.6.39/series
deleted file mode 100644
index 94ffa3a22..000000000
--- a/patches/iproute2-2.6.39/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-remove-duplicate-limits.h.patch
-0002-remove_arpd.diff
diff --git a/patches/iproute2-3.9.0/0001-build-system-fixes.patch b/patches/iproute2-3.9.0/0001-build-system-fixes.patch
new file mode 100644
index 000000000..df40efac5
--- /dev/null
+++ b/patches/iproute2-3.9.0/0001-build-system-fixes.patch
@@ -0,0 +1,33 @@
+From: Juergen Beisert <juergen@kreuzholzen.de>
+Date: Sun, 16 Jun 2013 11:17:42 +0200
+Subject: [PATCH] build system fixes
+
+Build arpd only if the user has requested it.
+Add a mechanism to feed in CPPFLAGS for cross builds.
+
+Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
+Signed-off-by: Jon Ringle <jon@ringle.org>
+---
+ misc/Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/misc/Makefile b/misc/Makefile
+index a59ff87..4e65239 100644
+--- a/misc/Makefile
++++ b/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)
diff --git a/patches/iproute2-3.9.0/series b/patches/iproute2-3.9.0/series
new file mode 100644
index 000000000..630efcf86
--- /dev/null
+++ b/patches/iproute2-3.9.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-build-system-fixes.patch
+# 6bd4edb4380a1163a2e685e434917e83  - git-ptx-patches magic
diff --git a/rules/iproute2.in b/rules/iproute2.in
index 08589ab9b..5c7112742 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -29,6 +29,12 @@ config IPROUTE2_ARPD
 	  Enabling this extry will enlarge your system by the berkely
 	  DB4.x library.
 
+config IPROUTE2_BRIDGE
+	bool
+	prompt "bridge"
+	help
+	  Show / manipulate bridge addresses and devices
+
 config IPROUTE2_CTSTAT
 	bool
 	prompt "ctstat"
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 5719ba094..f8a618b01 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,12 +17,11 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
 #
 # Paths and names
 #
-IPROUTE2_VERSION	:= 2.6.39
-IPROUTE2_MD5		:= 8a3b6bc77c2ecf752284aa4a6fc630a6
+IPROUTE2_VERSION	:= 3.9.0
+IPROUTE2_MD5		:= fd9db28e4f411a1e74de65c919ae590f
 IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
-IPROUTE2_SUFFIX		:= tar.gz
-IPROUTE2_URL		:= \
-	http://www.linuxgrill.com/anonymous/iproute2/NEW-OSDL/$(IPROUTE2).$(IPROUTE2_SUFFIX)
+IPROUTE2_SUFFIX		:= tar.xz
+IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
 IPROUTE2_SOURCE		:= $(SRCDIR)/$(IPROUTE2).$(IPROUTE2_SUFFIX)
 IPROUTE2_DIR		:= $(BUILDDIR)/$(IPROUTE2)
 IPROUTE2_LICENSE	:= GPLv2
@@ -31,25 +30,30 @@ IPROUTE2_LICENSE	:= GPLv2
 # Prepare
 # ----------------------------------------------------------------------------
 
-IPROUTE2_MAKEVARS := \
-	CC=$(CROSS_CC) \
-	LDFLAGS='-rdynamic' \
-	DBM_INCLUDE=$(SYSROOT)/usr/include
-
 $(STATEDIR)/iproute2.prepare:
 	@$(call targetinfo)
-	@touch $(IPROUTE2_DIR)/Config
+	@$(call world/prepare, IPROUTE2)
+# overwrite options we don't want, or may be misdetected
+	@echo 'TC_CONFIG_ATM:=n'	>> $(IPROUTE2_DIR)/Config
+	@echo 'TC_CONFIG_XT:=n'		>> $(IPROUTE2_DIR)/Config
+	@echo 'IPT_LIB_DIR:=/usr/lib'	>> $(IPROUTE2_DIR)/Config
 ifdef PTXCONF_IPROUTE2_ARPD
 	@echo BUILD_ARPD=y >> $(IPROUTE2_DIR)/Config
 endif
 	@$(call touch)
 
+IPROUTE2_MAKE_OPT := \
+	ROOTDIR=$(SYSROOT) \
+	LDFLAGS='-rdynamic' \
+	WFLAGS="-Wall"
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
 IPROUTE2_INSTALL_FILES-y =
 IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_ARPD) +=	/sbin/arpd
+IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_BRIDGE) +=	/sbin/bridge
 IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_CTSTAT) +=	/sbin/ctstat
 IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_GENL) +=	/sbin/genl
 IPROUTE2_INSTALL_FILES-$(PTXCONF_IPROUTE2_IP) +=	/sbin/ip