[Buildroot] [PATCH 1/2] iproute2: fix build with threads support disabled

[Buildroot] [PATCH 1/2] iproute2: fix build with threads support disabled

[Baruch Siach]

iproute2 renamed the configure script generated file to config.mk.
Update the berkeleydb disable code.

Fixes:
http://autobuild.buildroot.net/results/46d/46da1142806fb524326994585cec6de9f7f3f480/
http://autobuild.buildroot.net/results/3aa/3aa028fe9e730335d2af00d5969b674a3d9f640b/

Cc: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index b75349dbce70..c01917dffef0 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
 IPROUTE2_DEPENDENCIES += berkeleydb
 else
 define IPROUTE2_DISABLE_ARPD
-	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/Config
+	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/config.mk
 endef
 endif
 
-- 
2.15.1

[Buildroot] [PATCH 2/2] iproute2: fix configure output file name

[Baruch Siach]

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>
---
 package/iproute2/iproute2.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index c01917dffef0..15bb132c5001 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
 
-- 
2.15.1

[Buildroot] [PATCH 2/2] iproute2: fix configure output file name

[Petr Vorel]

> 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>

[Buildroot] [PATCH 1/2] iproute2: fix build with threads support disabled

[Petr Vorel]

> iproute2 renamed the configure script generated file to config.mk.
> Update the berkeleydb disable code.

> Fixes:
> http://autobuild.buildroot.net/results/46d/46da1142806fb524326994585cec6de9f7f3f480/
> http://autobuild.buildroot.net/results/3aa/3aa028fe9e730335d2af00d5969b674a3d9f640b/

> Cc: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
Acked-by: Petr Vorel <petr.vorel@gmail.com>

[Buildroot] [PATCH 1/2] iproute2: fix build with threads support disabled

[Thomas Petazzoni]

Hello,

On Sun, 17 Dec 2017 23:48:23 +0200, Baruch Siach wrote:
> iproute2 renamed the configure script generated file to config.mk.
> Update the berkeleydb disable code.
> 
> Fixes:
> http://autobuild.buildroot.net/results/46d/46da1142806fb524326994585cec6de9f7f3f480/
> http://autobuild.buildroot.net/results/3aa/3aa028fe9e730335d2af00d5969b674a3d9f640b/
> 
> Cc: Petr Vorel <petr.vorel@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/iproute2/iproute2.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Both patches applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com