From e0e2e2096c10765c6a89b605e996b3af432603fa Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sat, 22 Aug 2009 03:26:10 +0200 Subject: iproute2: complete rewrite of integration This is probably the most complete and fine-grained integration of iproute2 we ever had in both FreeWRT and OpenADK. ;) --- package/iproute2/patches/patch-Makefile | 33 ++++++++++++++++++---------- package/iproute2/patches/patch-configure | 30 +++++++++++++++++++++++++ package/iproute2/patches/patch-ip_Makefile | 10 --------- package/iproute2/patches/patch-ip_iptunnel_c | 17 -------------- package/iproute2/patches/patch-misc_Makefile | 13 +++++++++++ 5 files changed, 65 insertions(+), 38 deletions(-) create mode 100644 package/iproute2/patches/patch-configure delete mode 100644 package/iproute2/patches/patch-ip_Makefile delete mode 100644 package/iproute2/patches/patch-ip_iptunnel_c create mode 100644 package/iproute2/patches/patch-misc_Makefile (limited to 'package/iproute2/patches') diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile index bb7ba6a10..194162a87 100644 --- a/package/iproute2/patches/patch-Makefile +++ b/package/iproute2/patches/patch-Makefile @@ -1,19 +1,30 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iproute2-2.6.26.orig/Makefile 2008-07-25 22:46:07.000000000 +0200 -+++ iproute2-2.6.26/Makefile 2008-10-09 17:08:16.000000000 +0200 -@@ -21,13 +21,13 @@ ADDLIB+=ipx_ntop.o ipx_pton.o + - allow variables to be overridden + - allow passing TARGET_CFLAGS + overriding CCOPTS instead wont work, as this variable is being + 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 +@@ -20,10 +20,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o + #options for ipx + ADDLIB+=ipx_ntop.o ipx_pton.o - CC = gcc - HOSTCC = gcc +-CC = gcc +-HOSTCC = gcc -CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -+CCOPTS = -D_GNU_SOURCE -fwrapv -fno-ident -fwrapv -fno-ident -O2 -pipe -march=i586 -funit-at-a-time -pipe -march=i586 -funit-at-a-time -Wstrict-prototypes -Wall - CFLAGS = $(CCOPTS) -I../include $(DEFINES) +-CFLAGS = $(CCOPTS) -I../include $(DEFINES) ++CC := gcc ++HOSTCC := gcc ++CCOPTS := -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall ++CFLAGS = $(CCOPTS) -I../include $(DEFINES) ${TARGET_CFLAGS} YACCFLAGS = -d -t -v LDLIBS += -L../lib -lnetlink -lutil - --SUBDIRS=lib ip tc misc netem genl -+SUBDIRS=lib ip tc genl +@@ -31,6 +31,7 @@ LDLIBS += -L../lib -lnetlink -lutil + SUBDIRS=lib ip tc misc netem genl LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a ++LIBUTIL=../lib/libutil.a + all: Config + @set -e; \ diff --git a/package/iproute2/patches/patch-configure b/package/iproute2/patches/patch-configure new file mode 100644 index 000000000..38586090d --- /dev/null +++ b/package/iproute2/patches/patch-configure @@ -0,0 +1,30 @@ + use the compiler passed in $CC +--- iproute2-2.6.29-1.orig/configure 2009-03-24 23:40:54.000000000 +0100 ++++ iproute2-2.6.29-1/configure 2009-08-22 02:23:52.642364236 +0200 +@@ -16,7 +16,7 @@ int main(int argc, char **argv) { + return 0; + } + EOF +-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 ++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 + if [ $? -eq 0 ] + then + echo "TC_CONFIG_ATM:=y" >>Config +@@ -49,7 +49,7 @@ int main(int argc, char **argv) { + } + + EOF +-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then +@@ -81,7 +81,7 @@ int main(int argc, char **argv) { + } + + EOF +-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then diff --git a/package/iproute2/patches/patch-ip_Makefile b/package/iproute2/patches/patch-ip_Makefile deleted file mode 100644 index d1f2cceec..000000000 --- a/package/iproute2/patches/patch-ip_Makefile +++ /dev/null @@ -1,10 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iproute2-2.6.26.orig/ip/Makefile 2008-07-25 22:46:07.000000000 +0200 -+++ iproute2-2.6.26/ip/Makefile 2008-10-09 17:07:10.000000000 +0200 -@@ -1,5 +1,5 @@ - IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o \ -- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ -+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ - ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o \ - ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \ - iplink_vlan.o link_veth.o diff --git a/package/iproute2/patches/patch-ip_iptunnel_c b/package/iproute2/patches/patch-ip_iptunnel_c deleted file mode 100644 index c9e6098fb..000000000 --- a/package/iproute2/patches/patch-ip_iptunnel_c +++ /dev/null @@ -1,17 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- iproute2-2.6.26.orig/ip/iptunnel.c 2008-07-25 22:46:07.000000000 +0200 -+++ iproute2-2.6.26/ip/iptunnel.c 2008-10-09 17:08:43.000000000 +0200 -@@ -478,13 +478,6 @@ int do_iptunnel(int argc, char **argv) - break; - case AF_INET: - break; -- /* -- * This is silly enough but we have no easy way to make it -- * protocol-independent because of unarranged structure between -- * IPv4 and IPv6. -- */ -- case AF_INET6: -- return do_ip6tunnel(argc, argv); - default: - fprintf(stderr, "Unsupported family:%d\n", preferred_family); - exit(-1); diff --git a/package/iproute2/patches/patch-misc_Makefile b/package/iproute2/patches/patch-misc_Makefile new file mode 100644 index 000000000..95dbe51ec --- /dev/null +++ b/package/iproute2/patches/patch-misc_Makefile @@ -0,0 +1,13 @@ + disable compiling of arpd since it needs berkeley db which we dont have + yet +--- iproute2-2.6.29-1.orig/misc/Makefile 2009-03-24 23:40:54.000000000 +0100 ++++ iproute2-2.6.29-1/misc/Makefile 2009-08-22 02:48:24.794861772 +0200 +@@ -1,7 +1,7 @@ + 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 + -- cgit v1.2.3