From 702936f4c981e479bbc1bcd8b516b37a6767551d Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Mon, 7 Oct 2013 08:26:41 +0000 Subject: [PATCH] iproute2: update to 3.11 Signed-off-by: Luka Perkov SVN-Revision: 38313 --- package/network/utils/iproute2/Makefile | 4 ++-- .../utils/iproute2/patches/000-warnings.patch | 12 ------------ .../utils/iproute2/patches/008-no_netem.patch | 2 +- .../utils/iproute2/patches/110-extra-ccopts.patch | 4 ++-- .../utils/iproute2/patches/200-add-tc_esfq.patch | 2 +- 5 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 package/network/utils/iproute2/patches/000-warnings.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 1b42517bac..dbacd275c6 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.10.0 +PKG_VERSION:=3.11.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=45fb5427fc723a0001c72b92c931ba02 +PKG_MD5SUM:=d7ffb27bc9f0d80577b1f3fb9d1a7689 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) diff --git a/package/network/utils/iproute2/patches/000-warnings.patch b/package/network/utils/iproute2/patches/000-warnings.patch deleted file mode 100644 index 8f07c3896b..0000000000 --- a/package/network/utils/iproute2/patches/000-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -30,8 +30,7 @@ CC = gcc - HOSTCC = gcc - DEFINES += -D_GNU_SOURCE - CCOPTS = -O2 --WFLAGS := -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes --WFLAGS += -Wmissing-declarations -Wold-style-definition -+WFLAGS := -Wall -Wstrict-prototypes - - CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) - YACCFLAGS = -d -t -v diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch index 78baeadbd1..165ce0c9b9 100644 --- a/package/network/utils/iproute2/patches/008-no_netem.patch +++ b/package/network/utils/iproute2/patches/008-no_netem.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -35,7 +35,7 @@ WFLAGS := -Wall -Wstrict-prototypes +@@ -36,7 +36,7 @@ WFLAGS += -Wmissing-declarations -Wold-s CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) YACCFLAGS = -d -t -v diff --git a/package/network/utils/iproute2/patches/110-extra-ccopts.patch b/package/network/utils/iproute2/patches/110-extra-ccopts.patch index 71ec957ad0..4a08757bd9 100644 --- a/package/network/utils/iproute2/patches/110-extra-ccopts.patch +++ b/package/network/utils/iproute2/patches/110-extra-ccopts.patch @@ -6,6 +6,6 @@ DEFINES += -D_GNU_SOURCE -CCOPTS = -O2 +CCOPTS = -O2 $(EXTRA_CCOPTS) - WFLAGS := -Wall -Wstrict-prototypes + WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes + WFLAGS += -Wmissing-declarations -Wold-style-definition - CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) diff --git a/package/network/utils/iproute2/patches/200-add-tc_esfq.patch b/package/network/utils/iproute2/patches/200-add-tc_esfq.patch index df5dc017a2..f09b45004f 100644 --- a/package/network/utils/iproute2/patches/200-add-tc_esfq.patch +++ b/package/network/utils/iproute2/patches/200-add-tc_esfq.patch @@ -10,7 +10,7 @@ TCMODULES += q_tbf.o --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h -@@ -214,6 +214,33 @@ struct tc_sfq_xstats { +@@ -222,6 +222,33 @@ struct tc_sfq_xstats { __s32 allot; }; -- 2.25.1