diff options
Diffstat (limited to 'package/iproute2')
| -rw-r--r-- | package/iproute2/Makefile | 4 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-Makefile | 22 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-include_linux_if_bridge_h | 10 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-include_linux_xfrm_h | 10 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-netem_paretonormal_c | 19 |
5 files changed, 2 insertions, 63 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index ab8883d26..4057007bc 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 4.12.0 +PKG_VERSION:= 4.15.0 PKG_RELEASE:= 1 -PKG_HASH:= 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d +PKG_HASH:= 48d4616a99d7b609b7b795c0ae8ec57099fb0271ed89253e8772c02327798355 PKG_DESCR:= routing control utility PKG_SECTION:= net/route PKG_BUILDDEP:= iptables libnl linux-atm diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile deleted file mode 100644 index 7b6897065..000000000 --- a/package/iproute2/patches/patch-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- iproute2-4.10.0.orig/Makefile 2017-02-20 17:47:52.000000000 +0100 -+++ iproute2-4.10.0/Makefile 2017-04-23 20:17:20.972119072 +0200 -@@ -40,16 +40,16 @@ ADDLIB+=ipx_ntop.o ipx_pton.o - #options for mpls - ADDLIB+=mpls_ntop.o mpls_pton.o - --CC := gcc -+CC ?= gcc - HOSTCC ?= $(CC) - DEFINES += -D_GNU_SOURCE - # Turn on transparent support for LFS - DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE --CCOPTS = -O2 - WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 - --CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS) -+CFLAGS ?= -+CFLAGS += $(WFLAGS) -I../include $(DEFINES) - YACCFLAGS = -d -t -v - - SUBDIRS=lib ip tc bridge misc netem genl tipc devlink man diff --git a/package/iproute2/patches/patch-include_linux_if_bridge_h b/package/iproute2/patches/patch-include_linux_if_bridge_h deleted file mode 100644 index ec7c8bfd7..000000000 --- a/package/iproute2/patches/patch-include_linux_if_bridge_h +++ /dev/null @@ -1,10 +0,0 @@ ---- iproute2-4.5.0.orig/include/linux/if_bridge.h 2016-03-15 00:02:31.000000000 +0100 -+++ iproute2-4.5.0/include/linux/if_bridge.h 2016-04-21 02:44:12.713804912 +0200 -@@ -15,7 +15,6 @@ - - #include <linux/types.h> - #include <linux/if_ether.h> --#include <linux/in6.h> - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" diff --git a/package/iproute2/patches/patch-include_linux_xfrm_h b/package/iproute2/patches/patch-include_linux_xfrm_h deleted file mode 100644 index e66679a80..000000000 --- a/package/iproute2/patches/patch-include_linux_xfrm_h +++ /dev/null @@ -1,10 +0,0 @@ ---- iproute2-4.5.0.orig/include/linux/xfrm.h 2016-03-15 00:02:31.000000000 +0100 -+++ iproute2-4.5.0/include/linux/xfrm.h 2016-04-21 02:44:12.713804912 +0200 -@@ -1,7 +1,6 @@ - #ifndef _LINUX_XFRM_H - #define _LINUX_XFRM_H - --#include <linux/in6.h> - #include <linux/types.h> - - /* All of the structures in this file may not change size as they are diff --git a/package/iproute2/patches/patch-netem_paretonormal_c b/package/iproute2/patches/patch-netem_paretonormal_c deleted file mode 100644 index 5ff674e5a..000000000 --- a/package/iproute2/patches/patch-netem_paretonormal_c +++ /dev/null @@ -1,19 +0,0 @@ ---- iproute2-3.12.0.orig/netem/paretonormal.c 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/netem/paretonormal.c 2014-02-09 12:22:09.000000000 +0100 -@@ -11,15 +11,11 @@ - */ - #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> - -+#define NETEM_DIST_SCALE 8192 - #define TABLESIZE 16384 - #define TABLEFACTOR NETEM_DIST_SCALE - |