From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>,
Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH 2/2] iproute2: add patch to avoid iptables dependency
Date: Fri, 14 Oct 2016 15:51:03 +0200 [thread overview]
Message-ID: <20161014135103.5083-2-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20161014135103.5083-1-clemens.gruber@pqgruber.com>
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
prev parent reply other threads:[~2016-10-14 13:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 13:51 [ptxdist] [PATCH 1/2] iproute2: bump version Clemens Gruber
2016-10-14 13:51 ` Clemens Gruber [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161014135103.5083-2-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox