Our workaround for the iptables dependency problem is no longer
necessary due to the new option TC_CONFIG_NO_XT.
Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
.../0001-add-xtables-version.h.patch | 22 ----------------------
patches/iproute2-4.8.0/series | 1 -
rules/iproute2.make | 7 +++----
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
delete 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
deleted file mode 100644
index fe9ba7ac0..000000000
--- a/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4d90bfff717bd7be913832c7eaefd5b5f7408012 Mon Sep 17 00:00:00 2001
-From: Clemens Gruber <clemens.gru...@pqgruber.com>
-Date: Mon, 17 Oct 2016 17:06:20 +0200
-Subject: [PATCH] add xtables-version.h
-
-Signed-off-by: Clemens Gruber <clemens.gru...@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
deleted file mode 100644
index b705ae7cf..000000000
--- a/patches/iproute2-4.8.0/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-add-xtables-version.h.patch
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 674894c40..946247c3d 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
#
# Paths and names
#
-IPROUTE2_VERSION := 4.8.0
-IPROUTE2_MD5 := 54c6411863cb16a4375aa5f788dca767
+IPROUTE2_VERSION := 4.9.0
+IPROUTE2_MD5 := 44a8371a4b2c40e48e4c9f98cbd41391
IPROUTE2 := iproute2-$(IPROUTE2_VERSION)
IPROUTE2_SUFFIX := tar.xz
IPROUTE2_URL := $(call ptx/mirror, KERNEL,
utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
@@ -38,8 +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:=n' >> $(IPROUTE2_DIR)/Config
- @echo 'IPT_LIB_DIR:=/usr/lib' >> $(IPROUTE2_DIR)/Config
+ @echo 'TC_CONFIG_NO_XT:=y' >> $(IPROUTE2_DIR)/Config
@echo 'TC_CONFIG_ELF:=n' >> $(IPROUTE2_DIR)/Config
ifndef PTXCONF_GLOBAL_SELINUX
@echo 'HAVE_SELINUX:=n' >> $(IPROUTE2_DIR)/Config
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
