projects / openwrt / staging / dedeckeh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5bd006a)
iproute2: bump to 4.13
authorHans Dedecker <dedeckeh@gmail.com>
Sun, 1 Oct 2017 19:46:27 +0000 (21:46 +0200)
committerHans Dedecker <dedeckeh@gmail.com>
Fri, 13 Oct 2017 19:48:44 +0000 (21:48 +0200)
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
package/network/utils/iproute2/Makefile patch | blob | history
package/network/utils/iproute2/patches/001-config.patch patch | blob | history
package/network/utils/iproute2/patches/004-darwin_fixes.patch patch | blob | history
package/network/utils/iproute2/patches/006-no_sctp.patch patch | blob | history
package/network/utils/iproute2/patches/008-no_netem.patch patch | blob | history
package/network/utils/iproute2/patches/110-extra-ccopts.patch patch | blob | history
package/network/utils/iproute2/patches/120-libnetlink-pic.patch patch | blob | history
package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch patch | blob | history
package/network/utils/iproute2/patches/300-ip_tiny.patch patch | blob | history
package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch patch | blob | history
package/network/utils/iproute2/patches/950-add-cake-to-tc.patch patch | blob | history

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index 364c1b22a130b63e56411b78c59c563bc6be446f..14a33c515ac94c89284dadf26ab43863fad05c1b 100644 (file)
--- 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:=4.11.0
+PKG_VERSION:=4.13.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026
+PKG_HASH:=9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
@@ -28,7 +28,6 @@ define Package/iproute2/Default
   URL:=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
   SUBMENU:=Routing and Redirection
   MAINTAINER:=Russell Senior <russell@personaltelco.net>
-  DEPENDS:= +libnl-tiny
 endef
 
 define Package/ip-tiny
@@ -37,6 +36,7 @@ $(call Package/iproute2/Default)
  VARIANT:=tiny
  PROVIDES:=ip
  ALTERNATIVES:=200:/sbin/ip:/sbin/ip-tiny
+ DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/ip-full
@@ -45,32 +45,37 @@ $(call Package/iproute2/Default)
  VARIANT:=full
  PROVIDES:=ip
  ALTERNATIVES:=300:/sbin/ip:/sbin/ip-full
+ DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/tc
 $(call Package/iproute2/Default)
   TITLE:=Traffic control utility
-  DEPENDS:=+kmod-sched-core
+  DEPENDS:=+kmod-sched-core +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/genl
 $(call Package/iproute2/Default)
   TITLE:=General netlink utility frontend
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/ip-bridge
 $(call Package/iproute2/Default)
   TITLE:=Bridge configuration utility from iproute2
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/ss
 $(call Package/iproute2/Default)
   TITLE:=Socket statistics utility
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/nstat
 $(call Package/iproute2/Default)
   TITLE:=Network statistics utility
+  DEPENDS:=+libnl-tiny +(PACKAGE_devlink||PACKAGE_rdma):libmnl
 endef
 
 define Package/devlink
@@ -79,10 +84,24 @@ $(call Package/iproute2/Default)
   DEPENDS:=+libmnl
 endef
 
+define Package/rdma
+$(call Package/iproute2/Default)
+  TITLE:=Network rdma utility
+  DEPENDS:=+libmnl
+endef
+
 ifeq ($(BUILD_VARIANT),tiny)
   IP_CONFIG_TINY:=y
 endif
 
+ifdef CONFIG_PACKAGE_devlink
+  HAVE_MNL:=y
+endif
+
+ifdef CONFIG_PACKAGE_rdma
+  HAVE_MNL:=y
+endif
+
 define Build/Configure
        $(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
        $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
@@ -101,6 +120,7 @@ MAKE_FLAGS += \
        SHARED_LIBS="" \
        LDFLAGS="$(TARGET_LDFLAGS) -Wl,--gc-sections" \
        IP_CONFIG_TINY=$(IP_CONFIG_TINY) \
+       HAVE_MNL=$(HAVE_MNL) \
        IPT_LIB_DIR=/usr/lib/iptables \
        FPIC="$(FPIC)"
 
@@ -157,6 +177,11 @@ define Package/devlink/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/devlink/devlink $(1)/usr/sbin/
 endef
 
+define Package/rdma/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/rdma/rdma $(1)/usr/sbin/
+endef
+
 $(eval $(call BuildPackage,ip-tiny))
 $(eval $(call BuildPackage,ip-full))
 $(eval $(call BuildPackage,tc))
@@ -165,3 +190,4 @@ $(eval $(call BuildPackage,ip-bridge))
 $(eval $(call BuildPackage,ss))
 $(eval $(call BuildPackage,nstat))
 $(eval $(call BuildPackage,devlink))
+$(eval $(call BuildPackage,rdma))
diff --git a/package/network/utils/iproute2/patches/001-config.patch b/package/network/utils/iproute2/patches/001-config.patch
index b3208e063e8887632cfe2a13ef59bf4fae4b7474..7f23cfc35ec77fab40c7e683c387423ef8052bd8 100644 (file)
--- a/package/network/utils/iproute2/patches/001-config.patch
+++ b/package/network/utils/iproute2/patches/001-config.patch
@@ -1,8 +1,7 @@
 --- /dev/null
 +++ b/Config
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,4 @@
 +# Fixed config to disable ATM support even if present on host system
 +IP_CONFIG_SETNS:=y
 +TC_CONFIG_ATM:=n
 +TC_CONFIG_XT:=y
-+HAVE_MNL:=y
diff --git a/package/network/utils/iproute2/patches/004-darwin_fixes.patch b/package/network/utils/iproute2/patches/004-darwin_fixes.patch
index e1a5e975685aa216ec096998902f3fbef3b679d0..1f3eb101ea4c6d915b3be4f4c18a06c0147e6d98 100644 (file)
--- a/package/network/utils/iproute2/patches/004-darwin_fixes.patch
+++ b/package/network/utils/iproute2/patches/004-darwin_fixes.patch
@@ -42,7 +42,7 @@
  #define TABLESIZE     16384
 --- a/netem/paretonormal.c
 +++ b/netem/paretonormal.c
-@@ -15,10 +15,13 @@
+@@ -14,10 +14,13 @@
  #include <string.h>
  #include <math.h>
  #include <limits.h>
diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch b/package/network/utils/iproute2/patches/006-no_sctp.patch
index 0f6f269d40f0dc0955797d3b4d720eb84d11067c..e23fbcd77d1342293dbadcfc7c12f9ff8fe19b25 100644 (file)
--- a/package/network/utils/iproute2/patches/006-no_sctp.patch
+++ b/package/network/utils/iproute2/patches/006-no_sctp.patch
@@ -1,6 +1,6 @@
 --- a/ip/ipxfrm.c
 +++ b/ip/ipxfrm.c
-@@ -465,7 +465,6 @@ void xfrm_selector_print(struct xfrm_sel
+@@ -454,7 +454,6 @@ void xfrm_selector_print(struct xfrm_sel
        switch (sel->proto) {
        case IPPROTO_TCP:
        case IPPROTO_UDP:
@@ -8,7 +8,7 @@
        case IPPROTO_DCCP:
        default: /* XXX */
                if (sel->sport_mask)
-@@ -1321,7 +1320,6 @@ static int xfrm_selector_upspec_parse(st
+@@ -1329,7 +1328,6 @@ static int xfrm_selector_upspec_parse(st
                switch (sel->proto) {
                case IPPROTO_TCP:
                case IPPROTO_UDP:
diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch b/package/network/utils/iproute2/patches/008-no_netem.patch
index 47ffd9946d02a81d7d01f8126992e85a00ef6fb0..64896387f959e2d66e34801d230d81e4fdecd2a0 100644 (file)
--- a/package/network/utils/iproute2/patches/008-no_netem.patch
+++ b/package/network/utils/iproute2/patches/008-no_netem.patch
@@ -1,11 +1,11 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -52,7 +52,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
+@@ -49,7 +49,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
  CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
  YACCFLAGS = -d -t -v
  
--SUBDIRS=lib ip tc bridge misc netem genl tipc devlink man
-+SUBDIRS=lib ip tc bridge misc genl tipc devlink man
+-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
++SUBDIRS=lib ip tc bridge misc genl tipc devlink rdma man
  
  LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
  LDLIBS += $(LIBNETLINK)
diff --git a/package/network/utils/iproute2/patches/110-extra-ccopts.patch b/package/network/utils/iproute2/patches/110-extra-ccopts.patch
index b28e19de57ce72106565e446079cdcc236306b46..e779934d7215de1a609137ae93bdce936bb3c3f3 100644 (file)
--- a/package/network/utils/iproute2/patches/110-extra-ccopts.patch
+++ b/package/network/utils/iproute2/patches/110-extra-ccopts.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -45,7 +45,7 @@ HOSTCC ?= $(CC)
+@@ -42,7 +42,7 @@ HOSTCC ?= $(CC)
  DEFINES += -D_GNU_SOURCE
  # Turn on transparent support for LFS
  DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
index 1f397f71b2d85a044207a17925cde07f3c02961c..ebe122e005cb131bfb3b4dd71ba588a5d8cf8287 100644 (file)
--- a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
+++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
@@ -1,7 +1,7 @@
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -4,7 +4,7 @@ ifeq ($(IP_CONFIG_SETNS),y)
-       CFLAGS += -DHAVE_SETNS
+@@ -12,7 +12,7 @@ ifeq ($(HAVE_MNL),y)
+       CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
  endif
  
 -CFLAGS += -fPIC
diff --git a/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch b/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
index 42e29326b986def095b8f22551b63ae903a4a45b..c022d17126167a68fca6f848403c68598b86602f 100644 (file)
--- a/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
+++ b/package/network/utils/iproute2/patches/272-uapi-if_ether.h-prevent-redefinition-of-struct-ethhd.patch
@@ -65,15 +65,3 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /* Definitions for in.h */
  #define __UAPI_DEF_IN_ADDR            1
  #define __UAPI_DEF_IN_IPPROTO         1
---- a/ip/iplink_bridge.c
-+++ b/ip/iplink_bridge.c
-@@ -14,8 +14,8 @@
- #include <string.h>
- #include <netinet/in.h>
- #include <linux/if_link.h>
--#include <linux/if_bridge.h>
- #include <netinet/ether.h>
-+#include <linux/if_bridge.h>
- #include <net/if.h>
- 
- #include "rt_names.h"
diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch
index e1b1da4d20f986a74d8a729bced0dae0aba7b6ba..d48ea8581c78b5df111f1b2bac9805e5617b4d9b 100644 (file)
--- a/package/network/utils/iproute2/patches/300-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch
@@ -1,7 +1,7 @@
 --- a/ip/Makefile
 +++ b/ip/Makefile
-@@ -19,6 +19,13 @@ ifeq ($(IP_CONFIG_SETNS),y)
-       CFLAGS += -DHAVE_SETNS
+@@ -28,6 +28,13 @@ ifeq ($(HAVE_MNL),y)
+       LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
  endif
  
 +STATIC_SYM_FILTER:=
@@ -14,7 +14,7 @@
  ALLOBJ=$(IPOBJ) $(RTMONOBJ)
  SCRIPTS=ifcfg rtpr routel routef
  TARGETS=ip rtmon
-@@ -48,7 +55,7 @@ else
+@@ -57,7 +64,7 @@ else
  
  ip: static-syms.o
  static-syms.o: static-syms.h
@@ -68,11 +68,11 @@
        { "netconf",    do_ipnetconf },
 +#endif
        { "vrf",        do_ipvrf},
+       { "sr",         do_seg6 },
        { "help",       do_help },
-       { 0 }
 --- a/lib/utils.c
 +++ b/lib/utils.c
-@@ -777,6 +777,7 @@ const char *rt_addr_n2a_r(int af, int le
+@@ -787,6 +787,7 @@ const char *rt_addr_n2a_r(int af, int le
                return inet_ntop(af, addr, buf, buflen);
        case AF_MPLS:
                return mpls_ntop(af, addr, buf, buflen);
@@ -80,7 +80,7 @@
        case AF_IPX:
                return ipx_ntop(af, addr, buf, buflen);
        case AF_DECnet:
-@@ -786,6 +787,7 @@ const char *rt_addr_n2a_r(int af, int le
+@@ -796,6 +797,7 @@ const char *rt_addr_n2a_r(int af, int le
                memcpy(dna.a_addr, addr, 2);
                return dnet_ntop(af, &dna, buf, buflen);
        }
@@ -90,8 +90,8 @@
        default:
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
-       CFLAGS += -DHAVE_SETNS
+@@ -12,6 +12,10 @@ ifeq ($(HAVE_MNL),y)
+       CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
  endif
  
 +ifeq ($(IP_CONFIG_TINY),y)
diff --git a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
index 44f198f1bf9e304ea9bd25869a8f50fe378b56c0..a0fd154a572b51ec0efdbf12f592172a7317d7e5 100644 (file)
--- a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
+++ b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch
@@ -24,7 +24,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY
  
 --- a/include/linux/rtnetlink.h
 +++ b/include/linux/rtnetlink.h
-@@ -215,6 +215,7 @@ enum {
+@@ -220,6 +220,7 @@ enum {
        RTN_THROW,              /* Not in this table            */
        RTN_NAT,                /* Translate this address       */
        RTN_XRESOLVE,           /* Use external resolver        */
diff --git a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch
index 0705eb12c52dc3f30caabc06c351b32b8e527624..eacad074f1e47f997e483d1dd15ee9db653d4e6a 100644 (file)
--- a/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch
+++ b/package/network/utils/iproute2/patches/950-add-cake-to-tc.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/pkt_sched.h
 +++ b/include/linux/pkt_sched.h
-@@ -863,4 +863,60 @@ struct tc_pie_xstats {
+@@ -871,4 +871,60 @@ struct tc_pie_xstats {
        __u32 maxq;             /* maximum queue size */
        __u32 ecn_mark;         /* packets marked with ecn*/
  };
@@ -63,7 +63,7 @@
  #endif
 --- a/tc/Makefile
 +++ b/tc/Makefile
-@@ -67,6 +67,7 @@ TCMODULES += q_codel.o
+@@ -69,6 +69,7 @@ TCMODULES += q_codel.o
  TCMODULES += q_fq_codel.o
  TCMODULES += q_fq.o
  TCMODULES += q_pie.o
Staging tree of dedeckeh