summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2017-12-17 23:48:24 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-18 10:01:53 +0100
commitf822cd793b07fff3db17b3898b858f003ead70d7 (patch)
treebd6cebc307bb417e2a6d2ee679b2b7085269ae68
parenta8a9c33d107af7923651945a1b276260bd84a0ef (diff)
downloadbuildroot-f822cd793b07fff3db17b3898b858f003ead70d7.tar.gz
buildroot-f822cd793b07fff3db17b3898b858f003ead70d7.zip
iproute2: fix configure output file name
iproute2 renamed the configure script output file to config.mk. Update the config tweaking code accordingly. The configure script now detects xtables correctly, drop this part. Add a comment to explain the TC_CONFIG_XT disable tweak. Cc: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/iproute2/iproute2.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index c01917dffe..15bb132c50 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -31,9 +31,8 @@ define IPROUTE2_WITH_IPTABLES
endef
else
define IPROUTE2_WITH_IPTABLES
- # em_ipset needs xtables, but configure misdetects it
- echo "TC_CONFIG_IPSET:=n" >>$(@D)/Config
- echo "TC_CONFIG_XT:=n" >>$(@D)/Config
+ # m_xt.so is built unconditionally
+ echo "TC_CONFIG_XT:=n" >>$(@D)/config.mk
endef
endif
OpenPOWER on IntegriCloud