[ptxdist] [PATCH 1/2] iproute2: bump version

[ptxdist] [PATCH 1/2] iproute2: bump version

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/iproute2.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/iproute2.make b/rules/iproute2.make
index e1f4c7d..77acaf3 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
 #
 # Paths and names
 #
-IPROUTE2_VERSION	:= 4.7.0
-IPROUTE2_MD5		:= d4b205830cdc2702f8a0cbd6232129cd
+IPROUTE2_VERSION	:= 4.8.0
+IPROUTE2_MD5		:= 54c6411863cb16a4375aa5f788dca767
 IPROUTE2		:= iproute2-$(IPROUTE2_VERSION)
 IPROUTE2_SUFFIX		:= tar.xz
 IPROUTE2_URL		:= $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
-- 
2.10.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] iproute2: add patch to avoid iptables dependency

[Clemens Gruber]

Now we can also use TC_CONFIG_XT=n.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../0001-disable-iptables-dependency-in-tc.patch   | 25 ++++++++++++++++++++++
 patches/iproute2-4.8.0/series                      |  1 +
 rules/iproute2.make                                |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 patches/iproute2-4.8.0/0001-disable-iptables-dependency-in-tc.patch
 create mode 100644 patches/iproute2-4.8.0/series

diff --git a/patches/iproute2-4.8.0/0001-disable-iptables-dependency-in-tc.patch b/patches/iproute2-4.8.0/0001-disable-iptables-dependency-in-tc.patch
new file mode 100644
index 0000000..3925432
--- /dev/null
+++ b/patches/iproute2-4.8.0/0001-disable-iptables-dependency-in-tc.patch
@@ -0,0 +1,25 @@
+From 438d62f416afa9e0a255e4ee34ef8725f0b9a344 Mon Sep 17 00:00:00 2001
+From: Clemens Gruber <clemens.gruber@pqgruber.com>
+Date: Fri, 14 Oct 2016 15:37:40 +0200
+Subject: [PATCH] disable iptables dependency in tc
+
+---
+ tc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tc/Makefile b/tc/Makefile
+index 8917eaf..05828c8 100644
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -90,7 +90,7 @@ else
+ 	CFLAGS += -DTC_CONFIG_XT_H
+ 	TCSO += m_xt_old.so
+     else
+-      TCMODULES += m_ipt.o
++      #TCMODULES += m_ipt.o
+     endif
+   endif
+ endif
+-- 
+2.10.0
+
diff --git a/patches/iproute2-4.8.0/series b/patches/iproute2-4.8.0/series
new file mode 100644
index 0000000..ed10df6
--- /dev/null
+++ b/patches/iproute2-4.8.0/series
@@ -0,0 +1 @@
+0001-disable-iptables-dependency-in-tc.patch
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 77acaf3..674894c 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -38,7 +38,7 @@ $(STATEDIR)/iproute2.prepare:
 	@$(call world/prepare, IPROUTE2)
 # overwrite options we don't want, or may be misdetected
 	@echo 'TC_CONFIG_ATM:=n'	>> $(IPROUTE2_DIR)/Config
-	@echo 'TC_CONFIG_XT:=y'		>> $(IPROUTE2_DIR)/Config
+	@echo 'TC_CONFIG_XT:=n'		>> $(IPROUTE2_DIR)/Config
 	@echo 'IPT_LIB_DIR:=/usr/lib'	>> $(IPROUTE2_DIR)/Config
 	@echo 'TC_CONFIG_ELF:=n'	>> $(IPROUTE2_DIR)/Config
 ifndef PTXCONF_GLOBAL_SELINUX
-- 
2.10.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de