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

[ptxdist] [PATCH v2 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 v2 2/2] iproute2: add patch to avoid iptables dependency

[Clemens Gruber]

New patch, adding the missing build-dependency xtables-version.h.
Also set TC_CONFIG_XT=n in Config.

libxtables is not required, unless plugins that link to it are used.
Currently, none of these plugins are installed/installable in PTXdist.

Fixes: 333123a94302 ("iproute2: update version and minor improvements")

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 .../0001-add-xtables-version.h.patch               | 22 ++++++++++++++++++++++
 patches/iproute2-4.8.0/series                      |  1 +
 rules/iproute2.make                                |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
 create mode 100644 patches/iproute2-4.8.0/series

diff --git a/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch b/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
new file mode 100644
index 0000000..fe9ba7a
--- /dev/null
+++ b/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
@@ -0,0 +1,22 @@
+From 4d90bfff717bd7be913832c7eaefd5b5f7408012 Mon Sep 17 00:00:00 2001
+From: Clemens Gruber <clemens.gruber@pqgruber.com>
+Date: Mon, 17 Oct 2016 17:06:20 +0200
+Subject: [PATCH] add xtables-version.h
+
+Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
+---
+ include/xtables-version.h | 2 ++
+ 1 file changed, 2 insertions(+)
+ create mode 100644 include/xtables-version.h
+
+diff --git a/include/xtables-version.h b/include/xtables-version.h
+new file mode 100644
+index 000000000000..905e5fe070e7
+--- /dev/null
++++ b/include/xtables-version.h
+@@ -0,0 +1,2 @@
++#define XTABLES_VERSION "libxtables.so.11"
++#define XTABLES_VERSION_CODE 11
+-- 
+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..b705ae7
--- /dev/null
+++ b/patches/iproute2-4.8.0/series
@@ -0,0 +1 @@
+0001-add-xtables-version.h.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