Re: [LEDE-DEV] [PATCHv2] iproute2: update to v4.14.1

[Hans Dedecker]

Merged into my staging tree with
https://git.lede-project.org/?p=lede/dedeckeh/staging.git;a=commit;h=345388104121999fcd321685ad4db6059c63d4d6

Thanks
Hans

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCHv2] iproute2: update to v4.14.1

[Russell Senior]

Preserves optionality of libmnl by letting configuration 
script follow the HAVE_MNL environment variable.

Signed-off-by: Russell Senior 
---
 package/network/utils/iproute2/Makefile|  5 ++--
 .../utils/iproute2/patches/007-no_arpd.patch   |  6 ++--
 .../utils/iproute2/patches/008-no_netem.patch  |  2 +-
 .../patches/009-keep_libmnl_optional.patch | 11 
 .../iproute2/patches/120-libnetlink-pic.patch  |  7 ++---
 ...pi-libc-compat.h-do-not-rely-on-__GLIBC__.patch | 20 ++---
 ...er.h-prevent-redefinition-of-struct-ethhd.patch | 16 +--
 .../utils/iproute2/patches/300-ip_tiny.patch   | 22 +++
 .../iproute2/patches/900-drop_FAILED_POLICY.patch  | 33 +++---
 .../iproute2/patches/950-add-cake-to-tc.patch  |  8 +++---
 10 files changed, 64 insertions(+), 66 deletions(-)
 create mode 100644 
package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch

diff --git a/package/network/utils/iproute2/Makefile 
b/package/network/utils/iproute2/Makefile
index c2771f0b59..3e1db33258 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:=4.13.0
+PKG_VERSION:=4.14.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2
-PKG_HASH:=9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50
+PKG_HASH:=d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=iptables
 PKG_LICENSE:=GPL-2.0
@@ -21,6 +21,7 @@ PKG_CPE_ID:=cpe:/a:iproute2_project:iproute2
 
 
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
+include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iproute2/Default
diff --git a/package/network/utils/iproute2/patches/007-no_arpd.patch 
b/package/network/utils/iproute2/patches/007-no_arpd.patch
index 94fb197a45..ac216ba825 100644
--- a/package/network/utils/iproute2/patches/007-no_arpd.patch
+++ b/package/network/utils/iproute2/patches/007-no_arpd.patch
@@ -2,7 +2,7 @@
 +++ b/misc/Makefile
 @@ -5,9 +5,9 @@ TARGETS=ss nstat ifstat rtacct lnstat
  
- include ../Config
+ include ../config.mk
  
 -ifeq ($(HAVE_BERKELEY_DB),y)
 -  TARGETS += arpd
@@ -11,5 +11,5 @@
 +# TARGETS += arpd
 +#endif
  
- ifeq ($(HAVE_SELINUX),y)
-   LDLIBS += $(shell $(PKG_CONFIG) --libs libselinux)
+ all: $(TARGETS)
+ 
diff --git a/package/network/utils/iproute2/patches/008-no_netem.patch 
b/package/network/utils/iproute2/patches/008-no_netem.patch
index 64896387f9..2e088f1993 100644
--- a/package/network/utils/iproute2/patches/008-no_netem.patch
+++ b/package/network/utils/iproute2/patches/008-no_netem.patch
@@ -1,7 +1,7 @@
 --- a/Makefile
 +++ b/Makefile
 @@ -49,7 +49,7 @@ WFLAGS += -Wmissing-declarations -Wold-s
- CFLAGS := $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) $(CFLAGS)
+ CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) 
$(CFLAGS)
  YACCFLAGS = -d -t -v
  
 -SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
diff --git 
a/package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch 
b/package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch
new file mode 100644
index 00..7a5a702237
--- /dev/null
+++ b/package/network/utils/iproute2/patches/009-keep_libmnl_optional.patch
@@ -0,0 +1,11 @@
+--- a/configure
 b/configure
+@@ -292,7 +292,7 @@ check_selinux()
+ 
+ check_mnl()
+ {
+-  if ${PKG_CONFIG} libmnl --exists
++  if [ "${HAVE_MNL}" = "y" ] && ${PKG_CONFIG} libmnl --exists
+   then
+   echo "HAVE_MNL:=y" >>$CONFIG
+   echo "yes"
diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch 
b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
index ebe122e005..83ce66d976 100644
--- a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
+++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch
@@ -1,11 +1,10 @@
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -12,7 +12,7 @@ ifeq ($(HAVE_MNL),y)
-   CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
- endif
+@@ -1,6 +1,6 @@
+ include ../config.mk
  
 -CFLAGS += -fPIC
 +CFLAGS += $(FPIC)
  
  UTILOBJ = utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o \
-   inet_proto.o namespace.o json_writer.o \
+   inet_proto.o namespace.o json_writer.o json_print.o \
diff --git 
a/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
 
b/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
index b0ed599196..e3364ad059 100644
--- 
a/package/network/utils/iproute2/patches/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
+++