toolchain/helpers: make IPv6 mandatory for uclibc toolchains
PATCH 1/14 toolchain/helpers: make IPv6 mandatory for uclibc toolchains
As previously discussed drop the non-IPv6 option for toolchains. The size delta is about 10 KiB and it just complicates package dependencies.
Signed-off-by Gustavo Zacarias <[email protected]>
--- toolchain/helpers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
toolchain/helpers.mk +1 -1
@@ -284,7 +284,7 @@ check_uclibc = \ UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \ $(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\ - $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
Signature · 1 line
2.0.5
PATCH 2/14 package/uclibc: default to Y for IPv6
This will allow us to remove IPv6 handling in the tree without breaking things while doing so.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/uclibc/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
package/uclibc/Config.in +2 -5
@@ -87,11 +87,8 @@ config BR2_UCLIBC_CONFIG If unsure, use the default. config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6 - bool "Enable IPv6 support" - select BR2_INET_IPV6 - help - Enable this option if you want your toolchain to support - IPv6. + bool + default y config BR2_TOOLCHAIN_BUILDROOT_INET_RPC bool "Enable RPC support"
Signature · 1 line
2.0.5
PATCH 2/14 package/uclibc: default to Y for IPv6
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 13 lines
This will allow us to remove IPv6 handling in the tree without breaking things while doing so.
Signed-off-by Gustavo Zacarias <[email protected]>--- package/uclibc/Config.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)package/uclibc/Config.in +0
-0
package/uclibc/Config.in config BR2_UCLIBC_CONFIG · line 91
Quoted 5 lines
package/uclibc/Config.in +0
-2@@ -87,11 +87,8 @@ config BR2_UCLIBC_CONFIG If unsure, use the default. config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6 - bool "Enable IPv6 support" - select BR2_INET_IPV6
You should keep the 'select' until is really is gone.
Otherwise, it means uClibc has IPv6 support, but IPv6-dependent packages are not selectable, because they depend on BR2_INET_IPV6 which is not set, even though the C library supports it.
Granted, this is not a big problem, but still.
Regards,
Yann E. MORIN.
Quoted 15 lines
package/uclibc/Config.in +2
-3- help - Enable this option if you want your toolchain to support - IPv6. + bool + default y config BR2_TOOLCHAIN_BUILDROOT_INET_RPC bool "Enable RPC support"Signature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 3/14 toolchain-common: default to Y for IPv6
In reply to Gustavo ZacariasThis will allow us to remove IPv6 handling in the tree without breaking things while doing so.
Signed-off-by Gustavo Zacarias <[email protected]>
--- toolchain/toolchain-common.in | 1 + 1 file changed, 1 insertion(+)
toolchain/toolchain-common.in +1 -0
@@ -7,6 +7,7 @@ source "package/gdb/Config.in.host" config BR2_INET_IPV6 bool + default y config BR2_TOOLCHAIN_HAS_GCC_BUG_58595 bool
Signature · 1 line
2.0.5
PATCH 3/14 toolchain-common: default to Y for IPv6
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 13 lines
This will allow us to remove IPv6 handling in the tree without breaking things while doing so.
Signed-off-by Gustavo Zacarias <[email protected]>--- toolchain/toolchain-common.in | 1 + 1 file changed, 1 insertion(+)toolchain/toolchain-common.in +0
-0
toolchain/toolchain-common.in source "package/gdb/Config.in.host" · line 10
Quoted 4 lines
toolchain/toolchain-common.in +1
-0@@ -7,6 +7,7 @@ source "package/gdb/Config.in.host" config BR2_INET_IPV6 bool + default y
After the re-ordering of the series (i.e. CS sh2 toolchains are removed before this patch), then you can add my:
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 9 lines
toolchain/toolchain-common.in +0
-0config BR2_TOOLCHAIN_HAS_GCC_BUG_58595 boolSignature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 4/14 toolchain: remove IPv6 selects
In reply to Gustavo ZacariasThere's no need for toolchains or the user to declare IPv6 support since it's now mandatory.
Signed-off-by Gustavo Zacarias <[email protected]>
--- toolchain/Config.in | 2 -- toolchain/toolchain-external/Config.in | 11 ----------- 2 files changed, 13 deletions(-)
toolchain/Config.in +0 -2
@@ -9,7 +9,6 @@ config BR2_TOOLCHAIN # Should be selected for glibc or eglibc config BR2_TOOLCHAIN_USES_GLIBC bool - select BR2_INET_IPV6 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_TOOLCHAIN_HAS_THREADS
@@ -23,7 +22,6 @@ config BR2_TOOLCHAIN_USES_UCLIBC config BR2_TOOLCHAIN_USES_MUSL bool - select BR2_INET_IPV6 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_TOOLCHAIN_HAS_THREADS
toolchain/toolchain-external/Config.in +0 -11
@@ -780,7 +780,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_INET_IPV6 select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS
@@ -797,7 +796,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_INET_IPV6 select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS
@@ -814,7 +812,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_INET_IPV6 select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS
@@ -1145,14 +1142,6 @@ endchoice if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC -config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6 - bool "Toolchain has IPv6 support?" - select BR2_INET_IPV6 - help - Select this option if your external toolchain supports - IPv6. If you don't know, leave the default value, Buildroot - will tell you if it's correct or not. - config BR2_TOOLCHAIN_EXTERNAL_WCHAR bool "Toolchain has WCHAR support?" select BR2_USE_WCHAR
Signature · 1 line
2.0.5
PATCH 4/14 toolchain: remove IPv6 selects
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
toolchain/Config.in
Quoted 13 lines
There's no need for toolchains or the user to declare IPv6 support since it's now mandatory.
Signed-off-by Gustavo Zacarias <[email protected]>--- toolchain/Config.in | 2 -- toolchain/toolchain-external/Config.in | 11 ----------- 2 files changed, 13 deletions(-)toolchain/Config.in +0
-0
[--SNIP--]
toolchain/Config.in endchoice · line 1154
Quoted 11 lines
toolchain/Config.in +0
-7@@ -1145,14 +1142,6 @@ endchoice if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC -config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6 - bool "Toolchain has IPv6 support?" - select BR2_INET_IPV6 - help - Select this option if your external toolchain supports - IPv6. If you don't know, leave the default value, Buildroot - will tell you if it's correct or not.
This hunk should be squashed into your first patch (toolchain/helpers:
make IPv6 mandatory for uclibc toolchains).
Regards,
Yann E. MORIN.
Quoted 10 lines
toolchain/Config.in +0
-0config BR2_TOOLCHAIN_EXTERNAL_WCHAR bool "Toolchain has WCHAR support?" select BR2_USE_WCHARSignature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 5/14 toolchain-external: remove CS sh2 toolchains
In reply to Gustavo ZacariasNormally we'd deprecate them, but:
1) They don't support IPv6 and it's being removed so it makes no sense.
2) They're based on uClibc 0.9.30-ish which is very old and surely has package build breakage all over it.
Signed-off-by Gustavo Zacarias <[email protected]>
--- toolchain/toolchain-external/Config.in | 38 ---------------------------------- 1 file changed, 38 deletions(-)
toolchain/toolchain-external/Config.in +0 -38
@@ -630,44 +630,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103 - SH4A, uClibc, big endian Not usable in Buildroot yet. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103 - bool "Sourcery CodeBench SH 2011.03" - depends on BR2_sh2a - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - # kernel headers: 2.6.38 - help - Sourcery CodeBench toolchain for the SuperH architecture, - from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20, - uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.38. It has - support for the following variants: - - SH2A, uClibc, big endian - -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009 - bool "Sourcery CodeBench SH 2010.09" - depends on BR2_sh2a - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - # kernel headers: 2.6.35 - help - Sourcery CodeBench toolchain for the SuperH architecture, - from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20, - uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.35.2. It - has support for the following variants: - - SH2A, uClibc, big endian - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_201405 bool "Sourcery CodeBench AMD64 2014.05" depends on BR2_x86_64
Signature · 1 line
2.0.5
PATCH 5/14 toolchain-external: remove CS sh2 toolchains
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 5 lines
Normally we'd deprecate them, but:
1) They don't support IPv6 and it's being removed so it makes no sense.
2) They're based on uClibc 0.9.30-ish which is very old and surely has package build breakage all over it.
This should go in before patch 3 (toolchain-common: default to Y for IPv6) otherwise you can enable IPv6-dependent packages even with those toolchains.
Regards,
Yann E. MORIN.
Quoted 61 lines
Signed-off-by Gustavo Zacarias <[email protected]>--- toolchain/toolchain-external/Config.in | 38 ---------------------------------- 1 file changed, 38 deletions(-)toolchain/toolchain-external/Config.in +0
-38@@ -630,44 +630,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103 - SH4A, uClibc, big endian Not usable in Buildroot yet. -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103 - bool "Sourcery CodeBench SH 2011.03" - depends on BR2_sh2a - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - # kernel headers: 2.6.38 - help - Sourcery CodeBench toolchain for the SuperH architecture, - from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20, - uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.38. It has - support for the following variants: - - SH2A, uClibc, big endian - -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009 - bool "Sourcery CodeBench SH 2010.09" - depends on BR2_sh2a - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_USE_WCHAR - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - # kernel headers: 2.6.35 - help - Sourcery CodeBench toolchain for the SuperH architecture, - from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20, - uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.35.2. It - has support for the following variants: - - SH2A, uClibc, big endian - config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_201405 bool "Sourcery CodeBench AMD64 2014.05" depends on BR2_x86_64Signature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 6/14 package infra: drop non-IPv6 support
In reply to Gustavo ZacariasNow that IPv6 is mandatory remove support for non-IPv6 tweaks/variables in the package infra.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/Makefile.in | 6 ------ package/pkg-autotools.mk | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)
package/Makefile.in +0 -6
@@ -369,12 +369,6 @@ else DISABLE_NLS :=--disable-nls endif -ifeq ($(BR2_INET_IPV6),y) -DISABLE_IPV6 = --enable-ipv6 -else -DISABLE_IPV6 = --disable-ipv6 -endif - ifneq ($(BR2_INSTALL_LIBSTDCPP),y) TARGET_CONFIGURE_OPTS += CXX=false endif
package/pkg-autotools.mk +1 -1
@@ -200,8 +200,8 @@ define $(2)_CONFIGURE_CMDS --with-xmlto=no \ --with-fop=no \ --disable-dependency-tracking \ + --enable-ipv6 \ $$(DISABLE_NLS) \ - $$(DISABLE_IPV6) \ $$(ENABLE_DEBUG) \ $$(SHARED_STATIC_LIBS_OPTS) \ $$(QUIET) $$($$(PKG)_CONF_OPTS) \
Signature · 1 line
2.0.5
PATCH 6/14 package infra: drop non-IPv6 support
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 4 lines
Now that IPv6 is mandatory remove support for non-IPv6 tweaks/variables in the package infra.
Signed-off-by Gustavo Zacarias <[email protected]>
You're missing one instance of DISABLE_IPV6 in netsnmp:
NETSNMP_CONF_OPTS = \
[--SNIP--]
--without-kmem-usage $(DISABLE_IPV6) \
[--SNIP--]which should just be removed entirely I guess.
Regards,
Yann E. MORIN.
Quoted 43 lines
--- package/Makefile.in | 6 ------ package/pkg-autotools.mk | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)package/Makefile.in +0
-6@@ -369,12 +369,6 @@ else DISABLE_NLS :=--disable-nls endif -ifeq ($(BR2_INET_IPV6),y) -DISABLE_IPV6 = --enable-ipv6 -else -DISABLE_IPV6 = --disable-ipv6 -endif - ifneq ($(BR2_INSTALL_LIBSTDCPP),y) TARGET_CONFIGURE_OPTS += CXX=false endifpackage/pkg-autotools.mk +1
-1@@ -200,8 +200,8 @@ define $(2)_CONFIGURE_CMDS --with-xmlto=no \ --with-fop=no \ --disable-dependency-tracking \ + --enable-ipv6 \ $$(DISABLE_NLS) \ - $$(DISABLE_IPV6) \ $$(ENABLE_DEBUG) \ $$(SHARED_STATIC_LIBS_OPTS) \ $$(QUIET) $$($$(PKG)_CONF_OPTS) \Signature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 7/14 configs: drop redundant IPv6 option
In reply to Gustavo ZacariasDrop the buildroot toolchain IPv6 option from the only config that's got it since it's now a non-option.
Signed-off-by Gustavo Zacarias <[email protected]>
--- configs/armadeus_apf9328_defconfig | 1 - 1 file changed, 1 deletion(-)
configs/armadeus_apf9328_defconfig +0 -1
@@ -6,7 +6,6 @@ BR2_arm920t=y BR2_PACKAGE_GDB=y BR2_PACKAGE_HOST_GDB=y BR2_ENABLE_LOCALE_PURGE=y -BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=y
Signature · 1 line
2.0.5
PATCH 7/14 configs: drop redundant IPv6 option
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 4 lines
Drop the buildroot toolchain IPv6 option from the only config that's got it since it's now a non-option.
Signed-off-by Gustavo Zacarias <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 23 lines
--- configs/armadeus_apf9328_defconfig | 1 - 1 file changed, 1 deletion(-)configs/armadeus_apf9328_defconfig +0
-1@@ -6,7 +6,6 @@ BR2_arm920t=y BR2_PACKAGE_GDB=y BR2_PACKAGE_HOST_GDB=y BR2_ENABLE_LOCALE_PURGE=y -BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y BR2_TOOLCHAIN_BUILDROOT_LOCALE=y BR2_TOOLCHAIN_BUILDROOT_CXX=ySignature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 8/14 busybox: force ipv6 build
In reply to Gustavo ZacariasSince it isn't optional any more just force IPv6 on in busybox to avoid problems.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/busybox/busybox.mk | 8 -------- 1 file changed, 8 deletions(-)
package/busybox/busybox.mk +0 -8
@@ -97,18 +97,10 @@ define BUSYBOX_SET_LARGEFILE $(call KCONFIG_ENABLE_OPT,CONFIG_FDISK_SUPPORT_LARGE_DISKS,$(BUSYBOX_BUILD_CONFIG)) endef -# If IPv6 is enabled then enable basic ifupdown support for it -ifeq ($(BR2_INET_IPV6),y) define BUSYBOX_SET_IPV6 $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG)) $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG)) endef -else -define BUSYBOX_SET_IPV6 - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG)) -endef -endif # If we're using static libs do the same for busybox ifeq ($(BR2_STATIC_LIBS),y)
Signature · 1 line
2.0.5
PATCH 8/14 busybox: force ipv6 build
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 4 lines
Since it isn't optional any more just force IPv6 on in busybox to avoid problems.
Signed-off-by Gustavo Zacarias <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 34 lines
--- package/busybox/busybox.mk | 8 -------- 1 file changed, 8 deletions(-)package/busybox/busybox.mk +0
-8@@ -97,18 +97,10 @@ define BUSYBOX_SET_LARGEFILE $(call KCONFIG_ENABLE_OPT,CONFIG_FDISK_SUPPORT_LARGE_DISKS,$(BUSYBOX_BUILD_CONFIG)) endef -# If IPv6 is enabled then enable basic ifupdown support for it -ifeq ($(BR2_INET_IPV6),y) define BUSYBOX_SET_IPV6 $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG)) $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG)) endef -else -define BUSYBOX_SET_IPV6 - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG)) -endef -endif # If we're using static libs do the same for busybox ifeq ($(BR2_STATIC_LIBS),y)Signature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 9/14 system: drop IPv6 depend for systemd
In reply to Gustavo ZacariasIt's no longer an option so it must be dropped.
Signed-off-by Gustavo Zacarias <[email protected]>
--- system/Config.in | 1 - 1 file changed, 1 deletion(-)
system/Config.in +0 -1
@@ -81,7 +81,6 @@ config BR2_INIT_SYSTEMD depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_USE_WCHAR - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_USE_MMU
Signature · 1 line
2.0.5
PATCH 9/14 system: drop IPv6 depend for systemd
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 12 lines
It's no longer an option so it must be dropped.
Signed-off-by Gustavo Zacarias <[email protected]>--- system/Config.in | 1 - 1 file changed, 1 deletion(-)system/Config.in +0
-0
system/Config.in config BR2_INIT_SYSTEMD · line 84
Quoted 4 lines
system/Config.in +0
-1@@ -81,7 +81,6 @@ config BR2_INIT_SYSTEMD depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_USE_WCHAR - depends on BR2_INET_IPV6
I know you're taking care of that in a followup patch, but it seems weird that you drop the dependency here in the system option, but keep it in the systemd package, even though it is selected.
I would also remove the dependency in systemd at the same time; or push this patch after the packages have been cleaned up (I'd prfefer the first solution, though).
Regards,
Yann E. MORIN.
Quoted 10 lines
system/Config.in +0
-0depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_USE_MMUSignature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 10/14 docs/manual: remove references to IPv6
In reply to Gustavo ZacariasIt's no longer an option so remove all references to it.
Signed-off-by Gustavo Zacarias <[email protected]>
--- docs/manual/adding-packages-directory.txt | 11 +++-------- docs/manual/configure.txt | 10 +++++----- 2 files changed, 8 insertions(+), 13 deletions(-)
docs/manual/adding-packages-directory.txt +3 -8
@@ -207,10 +207,9 @@ coding style]. ==== Dependencies on target and toolchain options Many packages depend on certain options of the toolchain: the choice of -C library, C++ support, thread support, RPC support, IPv6 support, -wchar support, or dynamic library support. Some packages can only be -built on certain target architectures, or if an MMU is available in the -processor. +C library, C++ support, thread support, RPC support, wchar support, +or dynamic library support. Some packages can only be built on certain +target architectures, or if an MMU is available in the processor. These dependencies have to be expressed with the appropriate 'depends on' statements in the Config.in file. Additionally, for dependencies on
@@ -301,10 +300,6 @@ use in the comment. ** Dependency symbol: +BR2_TOOLCHAIN_HAS_NATIVE_RPC+ ** Comment string: +RPC+ -* IPv6 support -** Dependency symbol: +BR2_INET_IPV6+ -** Comment string: +IPv6+ (lowercase v) - * wchar support ** Dependency symbol: +BR2_USE_WCHAR+ ** Comment string: +wchar+
docs/manual/configure.txt +5 -5
@@ -109,8 +109,8 @@ most important ones allow to: * Change the version of the GCC compiler, binutils and the C library. * Select a number of toolchain options (uClibc only): whether the - toolchain should have IPv6 support, RPC support (used mainly for - NFS), wide-char support, locale support (for internationalization), + toolchain should have RPC support (used mainly for NFS), + wide-char support, locale support (for internationalization), C++ support or thread support. Depending on which options you choose, the number of userspace applications and libraries visible in Buildroot menus will change: many applications and libraries require
@@ -177,9 +177,9 @@ Then, you have three solutions to use an external toolchain: external toolchain uses the 'glibc' library, you only have to tell whether your toolchain supports C\++ or not and whether it has built-in RPC support. If your external toolchain uses the 'uClibc' - library, then you have to tell Buildroot if it supports IPv6, - RPC, wide-char, locale, program invocation, threads and - C++. At the beginning of the execution, Buildroot will tell you if + library, then you have to tell Buildroot if it supports RPC, + wide-char, locale, program invocation, threads and C++. + At the beginning of the execution, Buildroot will tell you if the selected options do not match the toolchain configuration. Our external toolchain support has been tested with toolchains from
Signature · 1 line
2.0.5
PATCH 10/14 docs/manual: remove references to IPv6
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 3 lines
It's no longer an option so remove all references to it.
Signed-off-by Gustavo Zacarias <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 69 lines
--- docs/manual/adding-packages-directory.txt | 11 +++-------- docs/manual/configure.txt | 10 +++++----- 2 files changed, 8 insertions(+), 13 deletions(-)docs/manual/adding-packages-directory.txt +3
-8@@ -207,10 +207,9 @@ coding style]. ==== Dependencies on target and toolchain options Many packages depend on certain options of the toolchain: the choice of -C library, C++ support, thread support, RPC support, IPv6 support, -wchar support, or dynamic library support. Some packages can only be -built on certain target architectures, or if an MMU is available in the -processor. +C library, C++ support, thread support, RPC support, wchar support, +or dynamic library support. Some packages can only be built on certain +target architectures, or if an MMU is available in the processor. These dependencies have to be expressed with the appropriate 'depends on' statements in the Config.in file. Additionally, for dependencies on@@ -301,10 +300,6 @@ use in the comment. ** Dependency symbol: +BR2_TOOLCHAIN_HAS_NATIVE_RPC+ ** Comment string: +RPC+ -* IPv6 support -** Dependency symbol: +BR2_INET_IPV6+ -** Comment string: +IPv6+ (lowercase v) - * wchar support ** Dependency symbol: +BR2_USE_WCHAR+ ** Comment string: +wchar+docs/manual/configure.txt +5
-5@@ -109,8 +109,8 @@ most important ones allow to: * Change the version of the GCC compiler, binutils and the C library. * Select a number of toolchain options (uClibc only): whether the - toolchain should have IPv6 support, RPC support (used mainly for - NFS), wide-char support, locale support (for internationalization), + toolchain should have RPC support (used mainly for NFS), + wide-char support, locale support (for internationalization), C++ support or thread support. Depending on which options you choose, the number of userspace applications and libraries visible in Buildroot menus will change: many applications and libraries require@@ -177,9 +177,9 @@ Then, you have three solutions to use an external toolchain: external toolchain uses the 'glibc' library, you only have to tell whether your toolchain supports C\++ or not and whether it has built-in RPC support. If your external toolchain uses the 'uClibc' - library, then you have to tell Buildroot if it supports IPv6, - RPC, wide-char, locale, program invocation, threads and - C++. At the beginning of the execution, Buildroot will tell you if + library, then you have to tell Buildroot if it supports RPC, + wide-char, locale, program invocation, threads and C++. + At the beginning of the execution, Buildroot will tell you if the selected options do not match the toolchain configuration. Our external toolchain support has been tested with toolchains fromSignature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 11/14 packages: remove non-IPv6 enabler patches
In reply to Gustavo ZacariasThese are no longer required so remove them.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/avahi/0003-ipv6only.patch | 19 -- package/avahi/0005-optional-ipv6.patch | 147 -------------- package/iproute2/0001-optional-ipv6.patch | 89 --------- package/iproute2/0002-vxlan-optional-ipv6.patch | 83 -------- package/libeXosip2/0001-fix-non-ipv6-build.patch | 22 --- package/libglib2/0001-optional-ipv6.patch | 195 ------------------ package/libnice/0001-build-IPV6_RECVERR.patch | 20 -- .../libtirpc/0003-Make-IPv6-support-optional.patch | 26 --- package/luasocket/0001-uClibc-IPv6.patch | 217 --------------------- package/perl/0001-uClibc-IPv6.patch | 61 ------ package/rpcbind/0003-Make-IPv6-configurable.patch | 42 ---- package/rpcbind/rpcbind.mk | 1 - package/x11vnc/0001-ipv6.patch | 25 --- 13 files changed, 947 deletions(-) delete mode 100644 package/avahi/0003-ipv6only.patch delete mode 100644 package/avahi/0005-optional-ipv6.patch delete mode 100644 package/iproute2/0001-optional-ipv6.patch delete mode 100644 package/iproute2/0002-vxlan-optional-ipv6.patch delete mode 100644 package/libeXosip2/0001-fix-non-ipv6-build.patch delete mode 100644 package/libglib2/0001-optional-ipv6.patch delete mode 100644 package/libnice/0001-build-IPV6_RECVERR.patch delete mode 100644 package/libtirpc/0003-Make-IPv6-support-optional.patch delete mode 100644 package/luasocket/0001-uClibc-IPv6.patch delete mode 100644 package/perl/0001-uClibc-IPv6.patch delete mode 100644 package/rpcbind/0003-Make-IPv6-configurable.patch delete mode 100644 package/x11vnc/0001-ipv6.patch
package/avahi/0003-ipv6only.patch deleted +0 -19
@@ -1,19 +0,0 @@ -diff -urpN avahi-0.6.22.orig/avahi-core/socket.c avahi-0.6.22/avahi-core/socket.c ---- avahi-0.6.22.orig/avahi-core/socket.c 2007-12-16 22:03:08.000000000 +0100 -+++ avahi-0.6.22/avahi-core/socket.c 2008-03-31 17:13:24.000000000 +0200 -@@ -394,13 +394,13 @@ int avahi_open_socket_ipv6(int no_reuse) - avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno)); - goto fail; - } -- -+#ifdef IPV6_V6ONLY - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno)); - goto fail; - } -- -+#endif - yes = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) { - avahi_log_warn("IPV6_MULTICAST_LOOP failed: %s", strerror(errno));
package/avahi/0005-optional-ipv6.patch deleted +0 -147
147 lines not on this page · raw message
package/iproute2/0001-optional-ipv6.patch deleted +0 -89
89 lines not on this page · raw message
package/iproute2/0002-vxlan-optional-ipv6.patch deleted +0 -83
83 lines not on this page · raw message
package/libeXosip2/0001-fix-non-ipv6-build.patch deleted +0 -22
@@ -1,22 +0,0 @@ -[PATCH] Fix build on systems without IPV6_TCLASS support - -The wrong variable name was used. - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - src/eXtl_udp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libeXosip2-3.6.0/src/eXtl_udp.c -=================================================================== ---- libeXosip2-3.6.0.orig/src/eXtl_udp.c -+++ libeXosip2-3.6.0/src/eXtl_udp.c -@@ -178,7 +178,7 @@ - res = setsockopt(udp_socket, IPPROTO_IPV6, IPV6_TCLASS, - (SOCKET_OPTION_VALUE)&tos, sizeof(tos)); - #else -- retval = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS, -+ res = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS, - (SOCKET_OPTION_VALUE)&tos, sizeof(tos)); - #endif - }
package/libglib2/0001-optional-ipv6.patch deleted +0 -195
195 lines not on this page · raw message
package/libnice/0001-build-IPV6_RECVERR.patch deleted +0 -20
@@ -1,20 +0,0 @@ -Make libnice build in non-IPv6 configurations - -Signed-off-by: Thomas Petazzoni <[email protected]> - -Index: b/stun/usages/bind.c -=================================================================== ---- a/stun/usages/bind.c -+++ b/stun/usages/bind.c -@@ -260,9 +260,11 @@ - case AF_INET: - setsockopt (fd, SOL_IP, IP_RECVERR, &yes, sizeof (yes)); - break; -+#ifdef IPV6_RECVERR - case AF_INET6: - setsockopt (fd, SOL_IPV6, IPV6_RECVERR, &yes, sizeof (yes)); - break; -+#endif - default: - /* Nothing to do. */ - break;
package/libtirpc/0003-Make-IPv6-support-optional.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From fbe5fccf0e3bdaae3defc66a288176797fd12a17 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <[email protected]> -Date: Sun, 24 Jun 2012 21:40:21 +0200 -Subject: [PATCH] Make IPv6 support optional - -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index b5db263..f086255 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -7,7 +7,7 @@ - - noinst_HEADERS = rpc_com.h - --AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 \ -+AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP \ - -D_GNU_SOURCE -Wall -pipe - - lib_LTLIBRARIES = libtirpc.la --- -2.0.0 -
package/luasocket/0001-uClibc-IPv6.patch deleted +0 -217
217 lines not on this page · raw message
package/perl/0001-uClibc-IPv6.patch deleted +0 -61
61 lines not on this page · raw message
package/rpcbind/0003-Make-IPv6-configurable.patch deleted +0 -42
42 lines not on this page · raw message
package/rpcbind/rpcbind.mk +0 -1
@@ -9,7 +9,6 @@ RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIN RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3c RPCBIND_LICENSE_FILES = COPYING -RPCBIND_AUTORECONF = YES RPCBIND_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
package/x11vnc/0001-ipv6.patch deleted +0 -25
@@ -1,25 +0,0 @@ -[PATCH] fix build on uClibc without IPv6 support - -Some systems (like uClibc) defines AF_INET6 even when configured without -IPv6 support, so don't use that to decide if IPv6 support should be enabled. - -Instead use the X11VNC_IPV6 define like elsewhere in the code. - -Signed-off-by: Peter Korsgaard <[email protected]> ---- - x11vnc/enc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: x11vnc-0.9.13/x11vnc/enc.h -=================================================================== ---- x11vnc-0.9.13.orig/x11vnc/enc.h -+++ x11vnc-0.9.13/x11vnc/enc.h -@@ -1733,7 +1733,7 @@ - } - - try6: --#ifdef AF_INET6 -+#if X11VNC_IPV6 - if (!getenv("ULTRAVNC_DSM_HELPER_NOIPV6")) { - struct sockaddr_in6 sin; - int one = 1, sock = -1;
Signature · 1 line
2.0.5
PATCH 11/14 packages: remove non-IPv6 enabler patches
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 22 lines
These are no longer required so remove them.
Signed-off-by Gustavo Zacarias <[email protected]>--- package/avahi/0003-ipv6only.patch | 19 -- package/avahi/0005-optional-ipv6.patch | 147 -------------- package/iproute2/0001-optional-ipv6.patch | 89 --------- package/iproute2/0002-vxlan-optional-ipv6.patch | 83 -------- package/libeXosip2/0001-fix-non-ipv6-build.patch | 22 --- package/libglib2/0001-optional-ipv6.patch | 195 ------------------ package/libnice/0001-build-IPV6_RECVERR.patch | 20 -- .../libtirpc/0003-Make-IPv6-support-optional.patch | 26 --- package/luasocket/0001-uClibc-IPv6.patch | 217 --------------------- package/perl/0001-uClibc-IPv6.patch | 61 ------ package/rpcbind/0003-Make-IPv6-configurable.patch | 42 ---- package/rpcbind/rpcbind.mk | 1 - package/x11vnc/0001-ipv6.patch | 25 --- 13 files changed, 947 deletions(-) delete mode 100644 package/avahi/0003-ipv6only.patch delete mode 100644 package/avahi/0005-optional-ipv6.patch delete mode 100644 package/iproute2/0001-optional-ipv6.patch delete mode 100644 package/iproute2/0002-vxlan-optional-ipv6.patch
Quoted 8 lines
delete mode 100644 package/libeXosip2/0001-fix-non-ipv6-build.patch delete mode 100644 package/libglib2/0001-optional-ipv6.patch delete mode 100644 package/libnice/0001-build-IPV6_RECVERR.patch delete mode 100644 package/libtirpc/0003-Make-IPv6-support-optional.patch delete mode 100644 package/luasocket/0001-uClibc-IPv6.patch delete mode 100644 package/perl/0001-uClibc-IPv6.patch delete mode 100644 package/rpcbind/0003-Make-IPv6-configurable.patch delete mode 100644 package/x11vnc/0001-ipv6.patch
We also have one patch dealing with IPv6 for lighttpd:
- package/lighttpd/0001-Fix-default-config-file.patch
@@ -90,7 +90,7 @@ server.port = 80
##
## Use IPv6?
##
-server.use-ipv6 = "enable"
+# server.use-ipv6 = "enable"
##
## bind to a specific IP- changes the default config to disable IPv6: do we want to keep that hunk?
Otherwise:
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 11/14 packages: remove non-IPv6 enabler patches
Quoted 14 lines · Yann E. MORIN
We also have one patch dealing with IPv6 for lighttpd:
-
package/lighttpd/0001-Fix-default-config-file.patch@@ -90,7 +90,7 @@ server.port = 80 ## ## Use IPv6? ## -server.use-ipv6 = "enable" +# server.use-ipv6 = "enable" ## ## bind to a specific IP
Quoted 6 lines
- changes the default config to disable IPv6: do we want to keep that hunk?
Otherwise:
Reviewed-by "Yann E. MORIN" <[email protected]>
For this one i'm unsure how lighttpd will react to enabling ipv6 on a non-ipv6 kernel, so i'll leave it as is.
Regards.
PATCH 12/14 packages: remove non-IPv6 dependencies and tweaks
In reply to Gustavo ZacariasNow that IPv6 is mandatory remove package dependencies and conditionals for it.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/aiccu/Config.in | 5 ++--- package/argus/Config.in | 5 ++--- package/atftp/Config.in | 5 ++--- package/batctl/Config.in | 5 ++--- package/bind/Config.in | 5 ++--- package/bluez5_utils/Config.in | 6 ++---- package/chrony/chrony.mk | 4 ---- package/civetweb/civetweb.mk | 6 +----- package/classpath/Config.in | 5 ----- package/collectd/Config.in | 7 ++----- package/connman/Config.in | 5 ++--- package/conntrack-tools/Config.in | 6 ++---- package/cppzmq/Config.in | 7 +++---- package/czmq/Config.in | 7 +++---- package/dhcp/dhcp.mk | 4 ---- package/dhcpcd/dhcpcd.mk | 4 ---- package/dnsmasq/dnsmasq.mk | 4 ---- package/dovecot/Config.in | 5 ----- package/ebtables/Config.in | 5 ----- package/ffmpeg/Config.in | 6 ------ package/filemq/Config.in | 7 +++---- package/gnuradio/Config.in | 6 ++---- package/gnutls/gnutls.mk | 2 +- package/gpsd/gpsd.mk | 5 ----- package/gstreamer/gst-ffmpeg/Config.in | 4 ---- package/gstreamer/gst-plugins-good/Config.in | 4 ---- package/hiawatha/hiawatha.mk | 1 - package/hostapd/hostapd.mk | 4 ---- package/iftop/Config.in | 5 ++--- package/iptables/iptables.mk | 8 -------- package/iptraf-ng/Config.in | 5 ----- package/iputils/Config.in | 2 +- package/iputils/iputils.mk | 20 ++++++-------------- package/jamvm/Config.in | 4 +--- package/kodi/Config.in | 5 ++--- package/libiio/libiio.mk | 2 +- package/libndp/Config.in | 4 ---- package/libnetfilter_queue/Config.in | 4 ---- package/libnftnl/Config.in | 4 ---- package/libnspr/libnspr.mk | 2 +- package/liboping/Config.in | 4 ---- package/libshairplay/Config.in | 5 ++--- package/libsoup/libsoup.mk | 7 ------- package/libuv/Config.in | 5 ++--- package/libvncserver/libvncserver.mk | 4 ---- package/libwebsockets/libwebsockets.mk | 9 +-------- package/linphone/Config.in | 6 ++---- package/lsof/lsof.mk | 9 ++------- package/ltp-testsuite/Config.in | 6 ++---- package/lxc/Config.in | 5 ++--- package/mediastreamer/Config.in | 6 ++---- package/minidlna/Config.in | 5 ++--- package/modem-manager/Config.in | 7 +++---- package/mongrel2/Config.in | 5 ++--- package/mono/Config.in | 5 ++--- package/mpd/Config.in | 4 ---- package/mplayer/mplayer.mk | 14 +------------- package/mtd/Config.in | 4 ---- package/ndisc6/Config.in | 5 ----- package/net-tools/net-tools.mk | 4 +--- package/netsnmp/netsnmp.mk | 11 +---------- package/network-manager/Config.in | 6 ++---- package/nftables/Config.in | 6 ++---- package/nginx/nginx.mk | 6 +++--- package/nmap/Config.in | 5 ++--- package/nodejs/Config.in | 6 ++---- package/ntp/ntp.mk | 4 ---- package/odhcp6c/Config.in | 5 ----- package/olsr/Config.in | 5 ++--- package/opencv/Config.in | 4 ---- package/openntpd/Config.in | 5 ++--- package/openobex/Config.in | 4 ---- package/openpgm/Config.in | 5 ++--- package/openvmtools/Config.in | 5 ++--- package/openvpn/Config.in | 5 ----- package/php-zmq/Config.in | 7 +++---- package/php/php.mk | 7 ------- package/postgresql/postgresql.mk | 8 +------- package/pppd/pppd.mk | 5 +---- package/proftpd/proftpd.mk | 3 +-- package/python-pyzmq/Config.in | 7 +++---- package/qemu/Config.in | 5 ++--- package/qt/qt.mk | 7 ------- package/qt5/Config.in | 5 ++--- package/quagga/Config.in | 5 ----- package/radvd/Config.in | 5 ----- package/redis/Config.in | 5 ++--- package/samba/samba.mk | 2 +- package/sconeserver/sconeserver.mk | 8 +------- package/ser2net/Config.in | 5 ----- package/smcroute/Config.in | 5 ----- package/spawn-fcgi/spawn-fcgi.mk | 4 ---- package/squid/Config.in | 6 ++---- package/strongswan/Config.in | 3 --- package/strongswan/strongswan.mk | 4 ++-- package/systemd/Config.in | 1 - package/tcl/Config.in | 6 ++---- package/tftpd/tftpd.mk | 4 ---- package/tovid/Config.in | 5 ++--- package/transmission/Config.in | 5 ++--- package/trinity/trinity.mk | 4 ---- package/tvheadend/Config.in | 5 ++--- package/ulogd/Config.in | 5 ++--- package/ussp-push/Config.in | 5 ++--- package/x11vnc/x11vnc.mk | 6 ------ package/zeromq/Config.in | 7 +++---- package/zmqpp/Config.in | 7 +++---- package/zyre/Config.in | 7 +++---- 108 files changed, 133 insertions(+), 445 deletions(-)
package/aiccu/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_AICCU bool "aiccu" - depends on BR2_INET_IPV6 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork()
@@ -22,8 +21,8 @@ config BR2_PACKAGE_AICCU http://www.sixxs.net/tools/aiccu/ -comment "aiccu needs a toolchain w/ IPv6, wchar, threads" +comment "aiccu needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU - depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
package/argus/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_ARGUS bool "argus" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBPCAP
@@ -10,6 +9,6 @@ config BR2_PACKAGE_ARGUS http://qosient.com/argus/ -comment "argus needs a toolchain w/ threads, IPv6" - depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6) +comment "argus needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU
package/atftp/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_ATFTP bool "atftp" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS help atftp is a client/server implementation of the TFTP
@@ -11,5 +10,5 @@ config BR2_PACKAGE_ATFTP http://sourceforge.net/projects/atftp/ -comment "atftp needs a toolchain w/ threads, IPv6" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 +comment "atftp needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/batctl/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_BATCTL bool "batctl" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS # libnl select BR2_PACKAGE_LIBNL help
@@ -8,5 +7,5 @@ config BR2_PACKAGE_BATCTL http://www.open-mesh.org/projects/batman-adv/wiki/Using-batctl -comment "batctl needs a toolchain w/ IPv6, threads" - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS +comment "batctl needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/bind/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS help
@@ -38,6 +37,6 @@ config BR2_PACKAGE_BIND_TOOLS endif -comment "bind needs a toolchain w/ IPv6, dynamic library" +comment "bind needs a toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS
package/bluez5_utils/Config.in +2 -4
@@ -3,7 +3,6 @@ config BR2_PACKAGE_BLUEZ5_UTILS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus - depends on BR2_INET_IPV6 depends on !BR2_STATIC_LIBS # uses dlfcn depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
@@ -62,10 +61,9 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST endif -comment "bluez5-utils needs a toolchain w/ wchar, threads, IPv6, headers >= 3.4, dynamic library" +comment "bluez5-utils needs a toolchain w/ wchar, threads, headers >= 3.4, dynamic library" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \ - BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS depends on BR2_USE_MMU comment "bluez5-utils conflicts with older bluez-utils version"
package/chrony/chrony.mk +0 -4
@@ -23,10 +23,6 @@ else CHRONY_CONF_OPTS += --disable-readline endif -ifneq ($(BR2_INET_IPV6),y) -CHRONY_CONF_OPTS += --disable-ipv6 -endif - # Ditch the doc build, needs makeinfo and we don't need them define CHRONY_DISABLE_DOCS $(SED) 's/chronyc chrony.txt/chronyc/' $(@D)/Makefile.in
package/civetweb/civetweb.mk +1 -5
@@ -9,16 +9,12 @@ CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md -CIVETWEB_CONF_OPTS = TARGET_OS=LINUX +CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0 CIVETWEB_LIBS = -lpthread -lm -ldl CIVETWEB_SYSCONFDIR = /etc CIVETWEB_HTMLDIR = /var/www -ifeq ($(BR2_INET_IPV6),y) -CIVETWEB_CONF_OPTS += WITH_IPV6=1 -endif - ifeq ($(BR2_CIVETWEB_WITH_LUA),y) CIVETWEB_CONF_OPTS += WITH_LUA=1 endif
package/classpath/Config.in +0 -5
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CLASSPATH select BR2_NEEDS_HOST_JAR select BR2_NEEDS_HOST_JAVAC depends on BR2_PACKAGE_JAMVM - depends on BR2_INET_IPV6 help GNU Classpath, Essential Libraries for Java, is a GNU project to create free core class libraries for use with
@@ -11,7 +10,3 @@ config BR2_PACKAGE_CLASSPATH language. http://classpath.org - -comment "classpath needs a toolchain w/ IPv6" - depends on BR2_PACKAGE_JAMVM - depends on !BR2_INET_IPV6
package/collectd/Config.in +2 -5
@@ -2,7 +2,6 @@ config BR2_PACKAGE_COLLECTD bool "collectd" # Uses fork() depends on BR2_USE_MMU - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS help
@@ -305,7 +304,6 @@ config BR2_PACKAGE_COLLECTD_OPENVPN config BR2_PACKAGE_COLLECTD_PING bool "ping" - depends on BR2_INET_IPV6 select BR2_PACKAGE_LIBOPING help Mesures network latency using ICMP "echo requests".
@@ -446,7 +444,6 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE config BR2_PACKAGE_COLLECTD_NETWORK bool "network" - depends on BR2_INET_IPV6 help Send/receive values from other instances of collectd.
@@ -489,6 +486,6 @@ endmenu endif -comment "collectd needs a toolchain w/ IPv6, threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS +comment "collectd needs a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS depends on BR2_USE_MMU
package/connman/Config.in +2 -3
@@ -4,7 +4,6 @@ config BR2_PACKAGE_CONNMAN select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_IPTABLES depends on BR2_USE_WCHAR # libglib2 - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus, libglib2 depends on !BR2_STATIC_LIBS # needs dlopen()
@@ -64,6 +63,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT endif # BR2_PACKAGE_CONNMAN -comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver, dynamic library" +comment "connman needs a toolchain w/ wchar, threads, resolver, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/conntrack-tools/Config.in +2 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS bool "conntrack-tools" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
@@ -16,7 +15,6 @@ config BR2_PACKAGE_CONNTRACK_TOOLS http://www.netfilter.org/projects/conntrack-tools/ -comment "conntrack-tools needs a toolchain w/ IPv6, threads" +comment "conntrack-tools needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || \ - !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) + depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
package/cppzmq/Config.in +3 -4
@@ -1,7 +1,6 @@ config BR2_PACKAGE_CPPZMQ bool "cppzmq" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_INET_IPV6 # zeromq depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ
@@ -10,6 +9,6 @@ config BR2_PACKAGE_CPPZMQ http://github.com/zeromq/cppzmq -comment "cppzmq needs a toolchain w/ C++, IPv6, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \ - BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) +comment "cppzmq needs a toolchain w/ C++, wchar, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ + BR2_TOOLCHAIN_HAS_THREADS)
package/czmq/Config.in +3 -4
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CZMQ select BR2_PACKAGE_ZEROMQ depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_INET_IPV6 # zeromq depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq help
@@ -11,7 +10,7 @@ config BR2_PACKAGE_CZMQ http://czmq.zeromq.org/ -comment "czmq needs a toolchain w/ C++, IPv6, wchar, threads" +comment "czmq needs a toolchain w/ C++, wchar, threads" depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \ - BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ + BR2_TOOLCHAIN_HAS_THREADS)
package/dhcp/dhcp.mk +0 -4
@@ -31,10 +31,6 @@ ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y) DHCP_CONF_OPTS += --enable-delayed-ack endif -ifneq ($(BR2_INET_IPV6),y) -DHCP_CONF_OPTS += --disable-dhcpv6 -endif - ifeq ($(BR2_PACKAGE_DHCP_SERVER),y) define DHCP_INSTALL_SERVER mkdir -p $(TARGET_DIR)/var/lib
package/dhcpcd/dhcpcd.mk +0 -4
@@ -10,10 +10,6 @@ DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd DHCPCD_DEPENDENCIES = host-pkgconf DHCPCD_LICENSE = BSD-2c -ifeq ($(BR2_INET_IPV6),) -DHCPCD_CONFIG_OPTS += --disable-ipv6 -endif - ifeq ($(BR2_STATIC_LIBS),y) DHCPCD_CONFIG_OPTS += --enable-static endif
package/dnsmasq/dnsmasq.mk +0 -4
@@ -14,10 +14,6 @@ DNSMASQ_DEPENDENCIES = host-pkgconf DNSMASQ_LICENSE = Dual GPLv2/GPLv3 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 -ifneq ($(BR2_INET_IPV6),y) -DNSMASQ_COPTS += -DNO_IPV6 -endif - ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) DNSMASQ_COPTS += -DNO_DHCP endif
package/dovecot/Config.in +0 -5
@@ -1,6 +1,5 @@ config BR2_PACKAGE_DOVECOT bool "dovecot" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() help Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-
@@ -52,7 +51,3 @@ config BR2_PACKAGE_DOVECOT_ZLIB source package/dovecot-pigeonhole/Config.in endif # BR2_PACKAGE_DOVECOT - -comment "dovecot needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6
package/ebtables/Config.in +0 -5
@@ -1,12 +1,7 @@ config BR2_PACKAGE_EBTABLES bool "ebtables" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() help Ethernet bridge frame table administration http://ebtables.sourceforge.net - -comment "ebtables needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6
package/ffmpeg/Config.in +0 -6
@@ -1,11 +1,5 @@ -comment "ffmpeg needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405 - menuconfig BR2_PACKAGE_FFMPEG bool "ffmpeg" - depends on BR2_INET_IPV6 # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
package/filemq/Config.in +3 -4
@@ -4,7 +4,6 @@ config BR2_PACKAGE_FILEMQ select BR2_PACKAGE_CZMQ select BR2_PACKAGE_ZEROMQ depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_INET_IPV6 # zeromq depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_USE_MMU # czmq
@@ -13,7 +12,7 @@ config BR2_PACKAGE_FILEMQ http://github.com/zeromq/filemq -comment "filemq needs a toolchain w/ C++, IPv6, wchar, threads" +comment "filemq needs a toolchain w/ C++, wchar, threads" depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \ - BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ + BR2_TOOLCHAIN_HAS_THREADS)
package/gnuradio/Config.in +2 -4
@@ -1,12 +1,10 @@ -comment "gnuradio needs a toolchain w/ C++, IPV6, NPTL, wchar, dynamic library" +comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INET_IPV6 || \ - BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS config BR2_PACKAGE_GNURADIO bool "gnuradio" - depends on BR2_INET_IPV6 # boost depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
package/gnutls/gnutls.mk +1 -1
@@ -22,7 +22,7 @@ GNUTLS_CONF_OPTS = \ --disable-doc \ --disable-guile \ --enable-local-libopts -GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \ +GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \ gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no) \
package/gpsd/gpsd.mk +0 -5
@@ -29,11 +29,6 @@ else GPSD_SCONS_OPTS += ncurses=no endif -# Disable IPv6, if we don't support it -ifneq ($(BR2_INET_IPV6),y) -GPSD_SCONS_OPTS += ipv6=no -endif - # Build libgpsmm if we've got C++ ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GPSD_LDFLAGS += -lstdc++
package/gstreamer/gst-ffmpeg/Config.in +0 -4
@@ -1,7 +1,6 @@ config BR2_PACKAGE_GST_FFMPEG bool "gst-ffmpeg" select BR2_PACKAGE_GST_PLUGINS_BASE - depends on BR2_INET_IPV6 help GStreamer plugin containing one plugin with a set of elements using the Libav library. It contains most popular decoders as well as
@@ -21,6 +20,3 @@ config BR2_PACKAGE_GST_FFMPEG_GPL be under GPL. endif - -comment "gst-ffmpeg needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6
package/gstreamer/gst-plugins-good/Config.in +0 -4
@@ -139,12 +139,8 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM bool "spectrum" config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP - depends on BR2_INET_IPV6 bool "udp" -comment "udp needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX bool "videobox"
package/hiawatha/hiawatha.mk +0 -1
@@ -17,7 +17,6 @@ HIAWATHA_CONF_OPTS += -DENABLE_SSL=OFF endif HIAWATHA_CONF_OPTS += \ - $(if $(BR2_INET_IPV6),,-DENABLE_IPV6=OFF) \ -DENABLE_TOOLKIT=OFF \ -DENABLE_XSLT=OFF \ -DCONFIG_DIR=/etc/hiawatha \
package/hostapd/hostapd.mk +0 -4
@@ -35,10 +35,6 @@ ifeq ($(BR2_STATIC_LIBS),y) HOSTAPD_LIBS += -lnl-3 -lm -lpthread endif -ifeq ($(BR2_INET_IPV6),) -HOSTAPD_CONFIG_DISABLE += CONFIG_IPV6 -endif - # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_OPENSSL),y) HOSTAPD_DEPENDENCIES += openssl
package/iftop/Config.in +2 -3
@@ -2,7 +2,6 @@ config BR2_PACKAGE_IFTOP bool "iftop" select BR2_PACKAGE_NCURSES select BR2_PACKAGE_LIBPCAP - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS help iftop does for network usage what top(1) does for CPU usage.
@@ -12,5 +11,5 @@ config BR2_PACKAGE_IFTOP http://www.ex-parrot.com/pdw/iftop/ -comment "iftop needs a toolchain w/ IPv6, threads" - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS +comment "iftop needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/iptables/iptables.mk +0 -8
@@ -40,16 +40,8 @@ define IPTABLES_TARGET_IPV6_SYMLINK_CREATE ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore endef -define IPTABLES_TARGET_IPV6_REMOVE - rm -f $(TARGET_DIR)/usr/lib/libip6tc.* -endef - IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_SYMLINK_CREATE -ifeq ($(BR2_INET_IPV6),y) IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_SYMLINK_CREATE -else -IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_REMOVE -endif $(eval $(autotools-package))
package/iptraf-ng/Config.in +0 -5
@@ -3,7 +3,6 @@ config BR2_PACKAGE_IPTRAF_NG depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES_TARGET_PANEL - depends on BR2_INET_IPV6 help IPTraf-ng is a ncurses-based network monitoring utility. It gathers data like TCP connection packet and byte counts, interface statistics
@@ -12,7 +11,3 @@ config BR2_PACKAGE_IPTRAF_NG https://fedorahosted.org/iptraf-ng/ IPTraf-ng is a fork of original IPTraf v3.0.0 (http://iptraf.seul.org). - -comment "iptraf-ng needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6
package/iputils/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_IPUTILS bool "iputils" - select BR2_PACKAGE_OPENSSL if BR2_INET_IPV6 + select BR2_PACKAGE_OPENSSL depends on BR2_USE_MMU # fork() help This package is set of small useful utilities for Linux networking.
package/iputils/iputils.mk +6 -14
@@ -10,6 +10,7 @@ IPUTILS_SOURCE = iputils-$(IPUTILS_VERSION).tar.bz2 IPUTILS_LICENSE = GPLv2+ BSD-3c # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING +IPUTILS_DEPENDENCIES = openssl # Build after busybox so target ends up with this package's full # versions of the applications instead of busybox applets.
@@ -20,20 +21,8 @@ endif # Disabling CAP_SETPCAP (file capabilities) IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - arping clockdiff ping rarpd rdisc tftpd tracepath - -ifeq ($(BR2_INET_IPV6),y) -# To support md5 for ping6 -IPUTILS_DEPENDENCIES += openssl - -IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6 - -define IPUTILS_IPV6_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6 - $(INSTALL) -D -m 755 $(@D)/tracepath6 $(TARGET_DIR)/bin/tracepath6 - $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 -endef -endif + arping clockdiff ping rarpd rdisc tftpd tracepath \ + ping6 tracepath6 traceroute6 define IPUTILS_BUILD_CMDS $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
@@ -47,6 +36,9 @@ define IPUTILS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc $(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd $(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath + $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6 + $(INSTALL) -D -m 755 $(@D)/tracepath6 $(TARGET_DIR)/bin/tracepath6 + $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 $(IPUTILS_IPV6_INSTALL_TARGET_CMDS) endef
package/jamvm/Config.in +1 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_JAMVM bool "jamvm" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ || BR2_mips || BR2_mipsel || BR2_powerpc
@@ -12,8 +11,7 @@ config BR2_PACKAGE_JAMVM http://jamvm.sf.net -comment "jamvm needs a toolchain w/ IPv6, threads" +comment "jamvm needs a toolchain w/ threads" depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ || BR2_mips || BR2_mipsel || BR2_powerpc - depends on !BR2_INET_IPV6 depends on !BR2_TOOLCHAIN_HAS_THREADS
package/kodi/Config.in +2 -3
@@ -2,9 +2,9 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool default y if BR2_arm || BR2_i386 || BR2_x86_64 -comment "kodi needs a toolchain w/ C++, IPv6, threads, wchar" +comment "kodi needs a toolchain w/ C++, threads, wchar" depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS - depends on !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_USE_MMU config BR2_PACKAGE_KODI_EGL_GLES
@@ -91,7 +91,6 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support - depends on BR2_INET_IPV6 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL
package/libiio/libiio.mk +1 -1
@@ -10,7 +10,7 @@ LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPLv2.1+ LIBIIO_LICENSE_FILES = COPYING -LIBIIO_CONF_OPTS = -DENABLE_IPV6=$(if $(BR2_INET_IPV6),ON,OFF) \ +LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \ -DWITH_LOCAL_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),ON,OFF) \ -DWITH_TESTS=$(if $(BR2_PACKAGE_LIBIIO_TESTS),ON,OFF)
package/libndp/Config.in +0 -4
@@ -1,12 +1,8 @@ config BR2_PACKAGE_LIBNDP bool "libndp" - depends on BR2_INET_IPV6 help This package contains a library which provides a wrapper for IPv6 Neighbor Discovery Protocol. It also provides a tool named ndptool for sending and receiving NDP messages. https://github.com/jpirko/libndp - -comment "libndp needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6
package/libnetfilter_queue/Config.in +0 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBNETFILTER_QUEUE bool "libnetfilter_queue" - depends on BR2_INET_IPV6 select BR2_PACKAGE_LIBNFNETLINK select BR2_PACKAGE_LIBMNL help
@@ -9,6 +8,3 @@ config BR2_PACKAGE_LIBNETFILTER_QUEUE connection tracking timeout infrastructure. http://www.netfilter.org/projects/libnetfilter_queue/ - -comment "libnetfilter_queue needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6
package/libnftnl/Config.in +0 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBNFTNL bool "libnftnl" - depends on BR2_INET_IPV6 # bad headers, no sa_family_t in linux/socket.h depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009) select BR2_PACKAGE_LIBMNL
@@ -32,6 +31,3 @@ comment "libnftnl XML parsing support needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS endif - -comment "libnftnl needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6
package/libnspr/libnspr.mk +1 -1
@@ -20,7 +20,7 @@ LIBNSPR_CONF_ENV = \ # NSPR mixes up --build and --host LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME) LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit -LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6 +LIBNSPR_CONF_OPTS += --enable-ipv6 ifeq ($(BR2_STATIC_LIBS),y) LIBNSPR_MAKE_OPTS = SHARED_LIBRARY=
package/liboping/Config.in +0 -4
@@ -1,11 +1,7 @@ config BR2_PACKAGE_LIBOPING bool "liboping" - depends on BR2_INET_IPV6 help liboping is a C library to generate ICMP echo requests, better known as "ping packets". http://noping.cc/ - -comment "liboping needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6
package/libshairplay/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBSHAIRPLAY bool "libshairplay" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # avahi depends on !BR2_STATIC_LIBS # avahi
@@ -13,6 +12,6 @@ config BR2_PACKAGE_LIBSHAIRPLAY https://github.com/juhovh/shairplay -comment "libshairplay needs a toolchain w/ IPv6, threads, dynamic library" +comment "libshairplay needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/libsoup/libsoup.mk +0 -7
@@ -11,15 +11,8 @@ LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_ LIBSOUP_LICENSE = LGPLv2+ LIBSOUP_LICENSE_FILES = COPYING LIBSOUP_INSTALL_STAGING = YES - LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) - -ifneq ($(BR2_INET_IPV6),y) -LIBSOUP_CONF_ENV += soup_cv_ipv6=no -endif - LIBSOUP_CONF_OPTS = --disable-glibtest - LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ libglib2 libxml2 sqlite host-intltool
package/libuv/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBUV bool "libuv" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() help
@@ -9,6 +8,6 @@ config BR2_PACKAGE_LIBUV https://github.com/libuv/libuv -comment "libuv needs a toolchain w/ IPv6, threads" - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS +comment "libuv needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU
package/libvncserver/libvncserver.mk +0 -4
@@ -28,10 +28,6 @@ ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBVNCSERVER_CONF_OPTS += --without-pthread endif -ifneq ($(BR2_INET_IPV6),y) -LIBVNCSERVER_CONF_OPTS += --without-ipv6 -endif - # openssl supports needs NPTL thread support ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),yy) LIBVNCSERVER_DEPENDENCIES += openssl
package/libwebsockets/libwebsockets.mk +1 -8
@@ -11,14 +11,7 @@ LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE LIBWEBSOCKETS_DEPENDENCIES = zlib LIBWEBSOCKETS_INSTALL_STAGING = YES - -LIBWEBSOCKETS_CONF_OPTS += -DWITHOUT_TESTAPPS=ON - -ifeq ($(BR2_INET_IPV6),y) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=ON -else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=OFF -endif +LIBWEBSOCKETS_CONF_OPTS = -DWITHOUT_TESTAPPS=ON -DLWS_IPV6=ON ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl
package/linphone/Config.in +2 -4
@@ -7,7 +7,6 @@ config BR2_PACKAGE_LINPHONE depends on BR2_INSTALL_LIBSTDCPP # mediastreamer depends on BR2_TOOLCHAIN_HAS_THREADS # ortp depends on BR2_USE_MMU # libeXosip2 - depends on BR2_INET_IPV6 # mediastreamer help Linphone is an internet phone or Voice Over IP phone (VoIP).
@@ -26,7 +25,6 @@ config BR2_PACKAGE_LINPHONE http://www.linphone.org/ -comment "linphone needs a toolchain w/ threads, C++, IPv6" +comment "linphone needs a toolchain w/ threads, C++" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INET_IPV6 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/lsof/lsof.mk +2 -7
@@ -16,11 +16,6 @@ LSOF_LICENSE_FILES = dialects/linux/dproto.h # Make certain full-blown lsof gets built after the busybox version (1.20+) LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) -BR2_LSOF_CFLAGS = -ifeq ($(BR2_INET_IPV6),) -BR2_LSOF_CFLAGS += -UHASIPv6 -endif - ifeq ($(BR2_USE_WCHAR),) define LSOF_CONFIGURE_WCHAR_FIXUPS $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \
@@ -44,7 +39,7 @@ endef define LSOF_CONFIGURE_CMDS (cd $(@D) ; \ - echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" \ + echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" \ LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \ LINUX_CLIB=-DGLIBCV=2 ./Configure linux) $(LSOF_CONFIGURE_WCHAR_FIXUPS)
@@ -52,7 +47,7 @@ define LSOF_CONFIGURE_CMDS endef define LSOF_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) endef define LSOF_INSTALL_TARGET_CMDS
package/ltp-testsuite/Config.in +2 -4
@@ -6,7 +6,6 @@ config BR2_PACKAGE_LTP_TESTSUITE bool "ltp-testsuite" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC # does not build, cachectl.h issue depends on !BR2_nios2
@@ -22,8 +21,7 @@ config BR2_PACKAGE_LTP_TESTSUITE http://ltp.sourceforge.net/ -comment "ltp-testsuite needs a toolchain w/ IPv6, RPC, threads" +comment "ltp-testsuite needs a toolchain w/ RPC, threads" depends on !BR2_nios2 depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \ - !BR2_TOOLCHAIN_HAS_NATIVE_RPC + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_NATIVE_RPC
package/lxc/Config.in +2 -3
@@ -1,7 +1,6 @@ config BR2_PACKAGE_LXC bool "lxc" select BR2_PACKAGE_LIBCAP - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() # the toolchain doesn't support setns syscall
@@ -15,9 +14,9 @@ config BR2_PACKAGE_LXC https://linuxcontainers.org/ -comment "lxc needs a toolchain w/ IPv6, threads, headers >= 3.0" +comment "lxc needs a toolchain w/ threads, headers >= 3.0" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305 depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405 - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS \ + depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
package/mediastreamer/Config.in +2 -4
@@ -3,7 +3,6 @@ config BR2_PACKAGE_MEDIASTREAMER select BR2_PACKAGE_ORTP depends on BR2_INSTALL_LIBSTDCPP # until fixed depends on BR2_TOOLCHAIN_HAS_THREADS # ortp - depends on BR2_INET_IPV6 help Mediastreamer is a powerful and lightweighted streaming engine specialized for voice/video telephony applications.
@@ -14,6 +13,5 @@ config BR2_PACKAGE_MEDIASTREAMER http://www.linphone.org/eng/documentation/dev/mediastreamer2.html -comment "mediastreamer needs a toolchain w/ threads, C++, IPv6" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INET_IPV6 +comment "mediastreamer needs a toolchain w/ threads, C++" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/minidlna/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_MINIDLNA bool "minidlna" - depends on BR2_INET_IPV6 # ffmpeg depends on BR2_USE_WCHAR # flac depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -22,6 +21,6 @@ config BR2_PACKAGE_MINIDLNA http://minidlna.sourceforge.net/ -comment "minidlna needs a toolchain w/ IPv6, threads, wchar" +comment "minidlna needs a toolchain w/ threads, wchar" depends on BR2_USE_MMU - depends on !(BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) + depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
package/modem-manager/Config.in +3 -4
@@ -2,7 +2,6 @@ config BR2_PACKAGE_MODEM_MANAGER bool "modemmanager" depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_DBUS - depends on BR2_INET_IPV6 depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus
@@ -28,7 +27,7 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI This option enables support for QMI protocol endif -comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads, IPv6" - depends on !BR2_INET_IPV6 || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV +comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_PACKAGE_HAS_UDEV depends on BR2_USE_MMU
package/mongrel2/Config.in +2 -3
@@ -1,8 +1,8 @@ -comment "mongrel2 needs a toolchain w/ C++, IPv6, threads, wchar" +comment "mongrel2 needs a toolchain w/ C++, threads, wchar" depends on BR2_UCLIBC_VERSION_SNAPSHOT || \ BR2_TOOLCHAIN_USES_GLIBC || \ BR2_arm - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR config BR2_PACKAGE_MONGREL2
@@ -10,7 +10,6 @@ config BR2_PACKAGE_MONGREL2 select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZEROMQ depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_INET_IPV6 # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_USE_WCHAR # zeromq -> util-linux # {get,make,swap}context functions present in
package/mono/Config.in +2 -3
@@ -6,7 +6,6 @@ config BR2_PACKAGE_MONO_ARCH_SUPPORTS config BR2_PACKAGE_MONO bool "mono" depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_MONO_45 if !BR2_PACKAGE_MONO_20 && !BR2_PACKAGE_MONO_40 help
@@ -37,5 +36,5 @@ config BR2_PACKAGE_MONO_45 endif -comment "mono needs a toolchain w/ IPv6, threads" - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS +comment "mono needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/mpd/Config.in +0 -4
@@ -78,15 +78,11 @@ config BR2_PACKAGE_MPD_FAAD2 config BR2_PACKAGE_MPD_FFMPEG bool "ffmpeg" select BR2_PACKAGE_FFMPEG - depends on BR2_INET_IPV6 help Enable ffmpeg input support. Select this if you want to play back files supported by ffmpeg. -comment "ffmpeg support needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - config BR2_PACKAGE_MPD_FLAC bool "flac" select BR2_PACKAGE_FLAC
package/mplayer/mplayer.mk +1 -13
@@ -264,22 +264,10 @@ define MPLAYER_CONFIGURE_CMDS --enable-cross-compile \ --disable-ivtv \ --enable-dynamic-plugins \ + --enable-inet6 \ ) endef -# this is available on uClibc 0.9.31 even without ipv6 support, breaking the -# build in ffmpeg/libavformat/udp.c -ifneq ($(BR2_INET_IPV6),y) -define MPLAYER_FIXUP_IPV6_MREQ_DETECTION - $(SED) 's/\(#define HAVE_STRUCT_IPV6_MREQ\) 1/\1 0/' $(@D)/config.h -endef - -MPLAYER_POST_CONFIGURE_HOOKS += MPLAYER_FIXUP_IPV6_MREQ_DETECTION -MPLAYER_CONF_OPTS += --disable-inet6 -else -MPLAYER_CONF_OPTS += --enable-inet6 -endif - define MPLAYER_BUILD_CMDS $(MAKE) -C $(@D) endef
package/mtd/Config.in +0 -4
@@ -90,12 +90,8 @@ config BR2_PACKAGE_MTD_NFTL_FORMAT bool "nftl_format" config BR2_PACKAGE_MTD_RECV_IMAGE - depends on BR2_INET_IPV6 bool "recv_image" -comment "recv_image needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - config BR2_PACKAGE_MTD_RFDDUMP bool "rfddump"
package/ndisc6/Config.in +0 -5
@@ -1,10 +1,5 @@ -comment "ndisc6 needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 - config BR2_PACKAGE_NDISC6 bool "ndisc6 tools" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help
package/net-tools/net-tools.mk +1 -3
@@ -28,12 +28,10 @@ define NET_TOOLS_ENABLE_I18N endef endif -# Enable IPv6 when appropiate -ifeq ($(BR2_INET_IPV6),y) +# Enable IPv6 define NET_TOOLS_ENABLE_IPV6 $(SED) 's:_AFINET6 0:_AFINET6 1:' $(@D)/config.h endef -endif NET_TOOLS_POST_CONFIGURE_HOOKS += NET_TOOLS_ENABLE_I18N NET_TOOLS_ENABLE_IPV6
package/netsnmp/netsnmp.mk +1 -10
@@ -17,7 +17,7 @@ NETSNMP_CONF_OPTS = \ --enable-mini-agent \ --without-rpm \ --with-logfile=none \ - --without-kmem-usage $(DISABLE_IPV6) \ + --without-kmem-usage \ --enable-as-needed \ --without-perl-modules \ --disable-embedded-perl \
@@ -81,15 +81,6 @@ else NETSNMP_CONF_OPTS += --disable-applications endif -# Remove IPv6 MIBs if there's no IPv6 -ifneq ($(BR2_INET_IPV6),y) -define NETSNMP_REMOVE_MIBS_IPV6 - rm -f $(TARGET_DIR)/usr/share/snmp/mibs/IPV6* -endef - -NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_REMOVE_MIBS_IPV6 -endif - define NETSNMP_REMOVE_BLOAT_MIBS for mib in $(NETSNMP_BLOAT_MIBS); do \ rm -f $(TARGET_DIR)/usr/share/snmp/mibs/$$mib-MIB.txt; \
package/network-manager/Config.in +2 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_NETWORK_MANAGER bool "networkmanager" - depends on BR2_INET_IPV6 depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus
@@ -51,8 +50,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_PPPD This option enables support for PPPD daemon endif -comment "NetworkManager needs udev /dev management and a toolchain w/ IPv6, wchar, threads, headers >= 3.7" +comment "NetworkManager needs udev /dev management and a toolchain w/ wchar, threads, headers >= 3.7" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
package/nftables/Config.in +2 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_NFTABLES bool "nftables" - depends on BR2_INET_IPV6 depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 select BR2_PACKAGE_GMP
@@ -16,6 +15,5 @@ config BR2_PACKAGE_NFTABLES http://www.netfilter.org/projects/nftables/index.html -comment "nftables needs a toolchain w/ IPv6, wchar, headers >= 3.4" - depends on !BR2_INET_IPV6 || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 +comment "nftables needs a toolchain w/ wchar, headers >= 3.4" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
package/nginx/nginx.mk +3 -3
@@ -14,7 +14,8 @@ NGINX_CONF_OPTS = \ --with-cc="$(TARGET_CC)" \ --with-cpp="$(TARGET_CC)" \ --with-cc-opt="$(TARGET_CFLAGS)" \ - --with-ld-opt="$(TARGET_LDFLAGS)" + --with-ld-opt="$(TARGET_LDFLAGS)" \ + --with-ipv6 # www-data user and group are used for nginx. Because these user and group # are already set by buildroot, it is not necessary to redefine them.
@@ -63,8 +64,7 @@ NGINX_CONF_OPTS += \ --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi NGINX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \ - $(if $(BR2_INET_IPV6),--with-ipv6) + $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) ifeq ($(BR2_PACKAGE_PCRE),y) NGINX_DEPENDENCIES += pcre
package/nmap/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_NMAP bool "nmap" - depends on BR2_INET_IPV6 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -12,6 +11,6 @@ config BR2_PACKAGE_NMAP http://nmap.org -comment "nmap needs a toolchain w/ C++, IPv6, threads" +comment "nmap needs a toolchain w/ C++, threads" depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
package/nodejs/Config.in +2 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_NODEJS bool "nodejs" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
@@ -15,12 +14,11 @@ config BR2_PACKAGE_NODEJS http://nodejs.org/ -comment "nodejs needs a toolchain w/ C++, IPv6, threads" +comment "nodejs needs a toolchain w/ C++, threads" depends on BR2_USE_MMU depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS if BR2_PACKAGE_NODEJS
package/ntp/ntp.mk +0 -4
@@ -18,10 +18,6 @@ NTP_CONF_OPTS = \ --with-yielding-select=yes \ --disable-local-libevent -ifneq ($(BR2_INET_IPV6),y) -NTP_CONF_ENV += isc_cv_have_in6addr_any=no -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) NTP_CONF_OPTS += --with-crypto NTP_DEPENDENCIES += openssl
package/odhcp6c/Config.in +0 -5
@@ -1,10 +1,5 @@ -comment "odhcp6c needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - depends on BR2_USE_MMU - config BR2_PACKAGE_ODHCP6C bool "odhcp6c" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() help odhcp6c is a minimal DHCPv6 and RA-client for use in embedded Linux
package/olsr/Config.in +2 -3
@@ -1,7 +1,6 @@ config BR2_PACKAGE_OLSR bool "olsrd" depends on BR2_USE_MMU # fork() - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS help The Optimized Link State Routing protocol (OLSR) is a
@@ -13,6 +12,6 @@ config BR2_PACKAGE_OLSR http://www.olsr.org/ -comment "olsr needs a toolchain w/ IPv6, threads" +comment "olsr needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/opencv/Config.in +0 -4
@@ -129,16 +129,12 @@ comment "3rd party support" config BR2_PACKAGE_OPENCV_WITH_FFMPEG bool "ffmpeg support" - depends on BR2_INET_IPV6 select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE help Use ffmpeg from the target system. -comment "ffmpeg support needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - config BR2_PACKAGE_OPENCV_WITH_GSTREAMER bool "gstreamer support" depends on BR2_USE_MMU # gstreamer -> libglib2
package/openntpd/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_OPENNTPD bool "openntpd" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # fork () depends on !BR2_PACKAGE_NTP # conflicting binaries
@@ -12,6 +11,6 @@ config BR2_PACKAGE_OPENNTPD http://www.openntpd.org/ -comment "openntpd needs a toolchain w/ NPTL, IPv6" +comment "openntpd needs a toolchain w/ NPTL" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
package/openobex/Config.in +0 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_OPENOBEX bool "openobex" - depends on BR2_INET_IPV6 help Free open source implementation of the Object Exchange (OBEX) protocol.
@@ -41,6 +40,3 @@ config BR2_PACKAGE_OPENOBEX_DUMP bool "enable protocol dumping for debugging" endif - -comment "openobex needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6
package/openpgm/Config.in +2 -3
@@ -5,7 +5,6 @@ config BR2_PACKAGE_OPENPGM depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1 depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INET_IPV6 depends on BR2_USE_WCHAR help OpenPGM is an open source implementation of the Pragmatic General
@@ -16,5 +15,5 @@ config BR2_PACKAGE_OPENPGM http://code.google.com/p/openpgm/ -comment "openpgm needs a toolchain w/ wchar, threads, IPv6" - depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR) +comment "openpgm needs a toolchain w/ wchar, threads" + depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
package/openvmtools/Config.in +2 -3
@@ -3,7 +3,6 @@ config BR2_PACKAGE_OPENVMTOOLS depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2 - depends on BR2_INET_IPV6 # libdnet depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC depends on BR2_ENABLE_LOCALE
@@ -45,8 +44,8 @@ comment "PAM support needs a toolchain w/ dynamic library" endif -comment "openvmtools needs a toolchain w/ wchar, IPv6, threads, RPC, locale" +comment "openvmtools needs a toolchain w/ wchar, threads, RPC, locale" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE
package/openvpn/Config.in +0 -5
@@ -1,10 +1,5 @@ -comment "openvpn needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 - config BR2_PACKAGE_OPENVPN bool "openvpn" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() help OpenVPN is a full-featured SSL VPN solution which can
package/php-zmq/Config.in +3 -4
@@ -1,12 +1,11 @@ -comment "php-zmq needs a toolchain w/ C++, IPv6, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \ - && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) +comment "php-zmq needs a toolchain w/ C++, wchar, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR \ + && BR2_TOOLCHAIN_HAS_THREADS) config BR2_PACKAGE_PHP_ZMQ bool "php-zmq" depends on BR2_PACKAGE_PHP depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_INET_IPV6 depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_ZEROMQ
package/php/php.mk +0 -7
@@ -61,13 +61,6 @@ else PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no endif -# Workaround for non-IPv6 uClibc toolchain -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -ifneq ($(BR2_INET_IPV6),y) -PHP_CFLAGS += -DHAVE_DEPRECATED_DNS_FUNCS -endif -endif - PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
package/postgresql/postgresql.mk +1 -7
@@ -9,17 +9,11 @@ POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL POSTGRESQL_LICENSE_FILES = COPYRIGHT - POSTGRESQL_INSTALL_STAGING = YES POSTGRESQL_CONFIG_SCRIPTS = pg_config +POSTGRESQL_CONF_ENV = ac_cv_type_struct_sockaddr_in6=yes ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -# overwrite IPV6 detection -ifeq ($(BR2_INET_IPV6),y) -POSTGRESQL_CONF_ENV += ac_cv_type_struct_sockaddr_in6=yes -else -POSTGRESQL_CONF_ENV += ac_cv_type_struct_sockaddr_in6=no -endif # PostgreSQL does not build against uClibc with locales # enabled, due to an uClibc bug, see # http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html
package/pppd/pppd.mk +1 -4
@@ -7,6 +7,7 @@ PPPD_VERSION = 2.4.7 PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz PPPD_SITE = ftp://ftp.samba.org/pub/ppp +PPPD_MAKE_OPTS = HAVE_INET6=y PPPD_LICENSE = LGPLv2+ LGPL BSD-4c BSD-3c GPLv2+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \
@@ -24,10 +25,6 @@ PPPD_DEPENDENCIES += libpcap PPPD_MAKE_OPTS += FILTER=y endif -ifeq ($(BR2_INET_IPV6),y) -PPPD_MAKE_OPTS += HAVE_INET6=y -endif - # pppd bundles some but not all of the needed kernel headers. The embedded # if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34, # and has been part of the kernel headers since 2.6.23, so drop it
package/proftpd/proftpd.mk +1 -2
@@ -48,8 +48,7 @@ PROFTPD_MAKE = $(MAKE1) define PROFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd - $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ - $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) + $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf endef define PROFTPD_INSTALL_INIT_SYSV
package/python-pyzmq/Config.in +3 -4
@@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PYZMQ bool "python-pyzmq" - depends on BR2_INET_IPV6 # zeromq depends on BR2_USE_WCHAR # zeromq depends on BR2_INSTALL_LIBSTDCPP # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
@@ -10,7 +9,7 @@ config BR2_PACKAGE_PYTHON_PYZMQ http://zeromq.org/bindings:python -comment "python-pyzmq needs a toolchain w/ C++, IPv6, wchar, threads" +comment "python-pyzmq needs a toolchain w/ C++, wchar, threads" depends on BR2_PACKAGE_PYTHON - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \ - BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ + BR2_TOOLCHAIN_HAS_THREADS)
package/qemu/Config.in +2 -3
@@ -1,7 +1,7 @@ -comment "QEMU requires a toolchain with IPv6, wchar, threads" +comment "QEMU requires a toolchain with wchar, threads" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU - depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR && BR2_INET_IPV6) + depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) config BR2_PACKAGE_QEMU bool "QEMU"
@@ -9,7 +9,6 @@ config BR2_PACKAGE_QEMU depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR # gettext depends on BR2_USE_MMU # fork() - depends on BR2_INET_IPV6 # for linux-user select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB
package/qt/qt.mk +0 -7
@@ -474,13 +474,6 @@ define QT_QMAKE_SET $(SED) '/include.*qws.conf/a$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf endef -ifneq ($(BR2_INET_IPV6),y) -define QT_CONFIGURE_IPV6 - $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(@D)/configure - $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(@D)/configure -endef -endif - ifneq ($(QT_CONFIG_FILE),) define QT_CONFIGURE_CONFIG_FILE cp $(QT_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h
package/qt5/Config.in +2 -3
@@ -11,15 +11,14 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_ARM_CPU_ARMV4 default y -comment "Qt5 needs a toolchain w/ wchar, IPv6, NPTL, C++" +comment "Qt5 needs a toolchain w/ wchar, NPTL, C++" depends on !BR2_PACKAGE_QT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL menuconfig BR2_PACKAGE_QT5 bool "Qt5" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE
package/quagga/Config.in +0 -5
@@ -1,11 +1,6 @@ -comment "quagga needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 - config BR2_PACKAGE_QUAGGA bool "quagga" depends on BR2_USE_MMU # fork() - depends on BR2_INET_IPV6 help Routing software suite, providing implementations of OSPFv2, OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+.
package/radvd/Config.in +0 -5
@@ -1,13 +1,8 @@ config BR2_PACKAGE_RADVD bool "radvd" depends on BR2_USE_MMU # fork() - depends on BR2_INET_IPV6 select BR2_PACKAGE_FLEX help IPv6 Router Advertisement Daemon. http://www.litech.org/radvd/ - -comment "radvd needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6
package/redis/Config.in +2 -3
@@ -2,7 +2,6 @@ config BR2_PACKAGE_REDIS bool "redis" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INET_IPV6 help Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can
@@ -10,6 +9,6 @@ config BR2_PACKAGE_REDIS http://www.redis.io -comment "redis needs a toolchain w/ IPv6, threads" +comment "redis needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/samba/samba.mk +1 -1
@@ -29,7 +29,7 @@ SAMBA_CONF_ENV = \ libreplace_cv_HAVE_SECURE_MKSTEMP=yes \ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ samba_cv_fpie=no \ - libreplace_cv_HAVE_IPV6=$(if $(BR2_INET_IPV6),yes,no) \ + libreplace_cv_HAVE_IPV6=yes \ $(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread) SAMBA_CONF_OPTS = \
package/sconeserver/sconeserver.mk +1 -7
@@ -13,7 +13,7 @@ SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_AUTORECONF = YES SCONESERVER_DEPENDENCIES += pcre -SCONESERVER_CONF_OPTS += --with-ip --with-local +SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 # Sconeserver configure script fails to find the libxml2 headers. ifeq ($(BR2_PACKAGE_LIBXML2),y)
@@ -21,12 +21,6 @@ SCONESERVER_CONF_OPTS += \ --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" endif -ifeq ($(BR2_INET_IPV6),y) -SCONESERVER_CONF_OPTS += --with-ip6 -else -SCONESERVER_CONF_OPTS += --without-ip6 -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) SCONESERVER_DEPENDENCIES += openssl SCONESERVER_CONF_OPTS += --with-ssl
package/ser2net/Config.in +0 -5
@@ -1,13 +1,8 @@ config BR2_PACKAGE_SER2NET bool "ser2net" depends on BR2_USE_MMU # fork() - depends on BR2_INET_IPV6 help Ser2net provides a way for a user to connect from a network connection to a serial port.. http://ser2net.sourceforge.net - -comment "ser2net needs a toolchain w/ IPv6" - depends on BR2_USE_MMU - depends on !BR2_INET_IPV6
package/smcroute/Config.in +0 -5
@@ -1,6 +1,5 @@ config BR2_PACKAGE_SMCROUTE bool "smcroute" - depends on BR2_INET_IPV6 depends on BR2_USE_MMU # fork() help SMCRoute is a command line tool to manipulate the multicast
@@ -11,7 +10,3 @@ config BR2_PACKAGE_SMCROUTE MLD signaling exists. https://github.com/troglobit/smcroute - -comment "smcroute needs a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - depends on BR2_USE_MMU
package/spawn-fcgi/spawn-fcgi.mk +0 -4
@@ -10,8 +10,4 @@ SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2 SPAWN_FCGI_LICENSE = BSD-3c SPAWN_FCGI_LICENSE_FILES = COPYING -ifneq ($(BR2_INET_IPV6),y) -SPAWN_FCGI_CONF_OPTS = --disable-ipv6 -endif - $(eval $(autotools-package))
package/squid/Config.in +2 -4
@@ -1,12 +1,10 @@ -comment "squid needs a toolchain w/ C++, IPv6, headers >= 3.0" +comment "squid needs a toolchain w/ C++, headers >= 3.0" depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 \ - || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_INET_IPV6 # needs fork() depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libcap
package/strongswan/Config.in +0 -3
@@ -24,9 +24,6 @@ menuconfig BR2_PACKAGE_STRONGSWAN if BR2_PACKAGE_STRONGSWAN -comment "kernel-netlink and socket-default options need a toolchain w/ IPv6" - depends on !BR2_INET_IPV6 - choice prompt "Cryptographic backend" default BR2_PACKAGE_STRONGSWAN_GMP
package/strongswan/strongswan.mk +2 -2
@@ -14,8 +14,8 @@ STRONGSWAN_CONF_OPTS += \ --without-lib-prefix \ --enable-led \ --enable-pkcs11=yes \ - --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \ - --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \ + --enable-kernel-netlink=yes \ + --enable-socket-default=yes \ --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \ --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \ --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
package/systemd/Config.in +0 -1
@@ -11,7 +11,6 @@ config BR2_PACKAGE_SYSTEMD bool "systemd" depends on BR2_INIT_SYSTEMD depends on BR2_USE_WCHAR # util-linux - depends on BR2_INET_IPV6 depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_USE_MMU # dbus
package/tcl/Config.in +2 -4
@@ -2,7 +2,6 @@ config BR2_PACKAGE_TCL bool "tcl" # fork() depends on BR2_USE_MMU - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS # See this mailing list thread: # http://lists.busybox.net/pipermail/buildroot/2015-March/121198.html
@@ -12,10 +11,9 @@ config BR2_PACKAGE_TCL http://www.tcl.tk -comment "tcl needs a toolchain w/ ipv6, threads, dynamic library" +comment "tcl needs a toolchain w/ threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS if BR2_PACKAGE_TCL
package/tftpd/tftpd.mk +0 -4
@@ -9,10 +9,6 @@ TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa TFTPD_CONF_OPTS = --without-tcpwrappers -ifneq ($(BR2_INET_IPV6),y) -TFTPD_CONF_OPTS += --without-ipv6 -endif - # Override BusyBox implementations if BusyBox is enabled. ifeq ($(BR2_PACKAGE_BUSYBOX),y) TFTPD_DEPENDENCIES += busybox
package/tovid/Config.in +2 -3
@@ -2,7 +2,6 @@ config BR2_PACKAGE_TOVID bool "tovid" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INET_IPV6 # ffmpeg depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
@@ -28,11 +27,11 @@ config BR2_PACKAGE_TOVID http://tovid.wikia.com/wiki/Installing_tovid -comment "tovid needs a toolchain w/ threads, IPv6, C++, wchar" +comment "tovid needs a toolchain w/ threads, C++, wchar" depends on BR2_USE_MMU depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_INSTALL_LIBSTDCPP \ || !BR2_USE_WCHAR comment "tovid depends on python or python3"
package/transmission/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_TRANSMISSION bool "transmission" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ZLIB
@@ -48,6 +47,6 @@ comment "transmission-gtk needs a toolchain w/ locale" depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE endif -comment "transmission needs a toolchain w/ IPv6, threads" +comment "transmission needs a toolchain w/ threads" depends on BR2_USE_MMU - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS
package/trinity/trinity.mk +0 -4
@@ -9,10 +9,6 @@ TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION)) TRINITY_LICENSE = GPLv2 TRINITY_LICENSE_FILES = COPYING -ifeq ($(BR2_INET_IPV6),) -TARGET_CONFIGURE_OPTS += IPV6=no -endif - define TRINITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh) endef
package/tvheadend/Config.in +2 -3
@@ -1,9 +1,8 @@ -comment "tvheadend needs a toolchain w/ IPv6, NPTL, headers >= 3.2" - depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 +comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 config BR2_PACKAGE_TVHEADEND bool "tvheadend" - depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 select BR2_PACKAGE_DTV_SCAN_TABLES
package/ulogd/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_ULOGD bool "ulogd" - depends on BR2_INET_IPV6 depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # ulog support removed for kernels >= 3.17
@@ -15,7 +14,7 @@ config BR2_PACKAGE_ULOGD http://www.netfilter.org/projects/ulogd/ -comment "ulogd needs a toolchain w/ IPv6, dynamic library" - depends on !BR2_INET_IPV6 || BR2_STATIC_LIBS +comment "ulogd needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
package/ussp-push/Config.in +2 -3
@@ -1,6 +1,5 @@ config BR2_PACKAGE_USSP_PUSH bool "ussp-push" - depends on BR2_INET_IPV6 depends on !BR2_STATIC_LIBS # bluez_utils depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
@@ -14,6 +13,6 @@ config BR2_PACKAGE_USSP_PUSH http://www.xmailserver.org/ussp-push.html -comment "ussp-push needs a toolchain w/ wchar, IPv6, threads, dynamic library" +comment "ussp-push needs a toolchain w/ wchar, threads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
package/x11vnc/x11vnc.mk +0 -6
@@ -13,12 +13,6 @@ X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst X11VNC_LICENSE = GPLv2+ X11VNC_LICENSE_FILES = COPYING -ifneq ($(BR2_INET_IPV6),y) -# configure option only used for libvncserver -X11VNC_CONF_OPTS += --without-ipv6 -X11VNC_CONF_ENV += CFLAGS='$(TARGET_CFLAGS) -DX11VNC_IPV6=0' -endif - ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) X11VNC_DEPENDENCIES += avahi dbus else
package/zeromq/Config.in +3 -4
@@ -1,11 +1,10 @@ -comment "zeromq needs a toolchain w/ C++, IPv6, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \ - BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) +comment "zeromq needs a toolchain w/ C++, wchar, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ + BR2_TOOLCHAIN_HAS_THREADS) config BR2_PACKAGE_ZEROMQ bool "zeromq" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_INET_IPV6 depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_UTIL_LINUX
package/zmqpp/Config.in +3 -4
@@ -6,7 +6,6 @@ config BR2_PACKAGE_ZMQPP depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 # c++0x support depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009 # c++0x support depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_INET_IPV6 # zeromq depends on BR2_USE_WCHAR # util-linux depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq select BR2_PACKAGE_ZEROMQ
@@ -18,9 +17,9 @@ config BR2_PACKAGE_ZMQPP http://github.com/benjamg/zmqpp -comment "zmqpp needs a toolchain w/ C++, IPv6, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \ - BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) +comment "zmqpp needs a toolchain w/ C++, wchar, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ + BR2_TOOLCHAIN_HAS_THREADS) if BR2_PACKAGE_ZMQPP
package/zyre/Config.in +3 -4
@@ -1,7 +1,6 @@ config BR2_PACKAGE_ZYRE bool "zyre" depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_INET_IPV6 # zeromq depends on BR2_USE_WCHAR # zeromq depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq depends on BR2_USE_MMU # czmq
@@ -16,8 +15,8 @@ config BR2_PACKAGE_ZYRE http://zyre.org -comment "zyre needs a toolchain w/ C++, IPv6, wchar, threads" +comment "zyre needs a toolchain w/ C++, wchar, threads" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \ - BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \ + BR2_TOOLCHAIN_HAS_THREADS)
Signature · 1 line
2.0.5
PATCH 12/14 packages: remove non-IPv6 dependencies and tweaks
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 4 lines
Now that IPv6 is mandatory remove package dependencies and conditionals for it.
Signed-off-by Gustavo Zacarias <[email protected]>
You've missed an instance in package/php/Config.ext .
[--SNIP--]
Quoted 36 lines
package/iputils/iputils.mk +3
-14@@ -10,6 +10,7 @@ IPUTILS_SOURCE = iputils-$(IPUTILS_VERSION).tar.bz2 IPUTILS_LICENSE = GPLv2+ BSD-3c # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING +IPUTILS_DEPENDENCIES = openssl # Build after busybox so target ends up with this package's full # versions of the applications instead of busybox applets.@@ -20,20 +21,8 @@ endif # Disabling CAP_SETPCAP (file capabilities) IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - arping clockdiff ping rarpd rdisc tftpd tracepath - -ifeq ($(BR2_INET_IPV6),y) -# To support md5 for ping6 -IPUTILS_DEPENDENCIES += openssl - -IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6 - -define IPUTILS_IPV6_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6 - $(INSTALL) -D -m 755 $(@D)/tracepath6 $(TARGET_DIR)/bin/tracepath6 - $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 -endef -endif + arping clockdiff ping rarpd rdisc tftpd tracepath \ + ping6 tracepath6 traceroute6 define IPUTILS_BUILD_CMDS $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
package/iputils/iputils.mk define IPUTILS_INSTALL_TARGET_CMDS · line 42
Quoted 7 lines
package/iputils/iputils.mk +3
-0@@ -47,6 +36,9 @@ define IPUTILS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc $(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd $(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath + $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6 + $(INSTALL) -D -m 755 $(@D)/tracepath6 $(TARGET_DIR)/bin/tracepath6 + $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 $(IPUTILS_IPV6_INSTALL_TARGET_CMDS)
IPUTILS_IPV6_INSTALL_TARGET_CMDS is now always undefined, you can ditch it too.
[--SNIP--]
package/libnspr/libnspr.mk LIBNSPR_CONF_ENV = \ · line 23
Quoted 10 lines
package/libnspr/libnspr.mk +1
-1@@ -20,7 +20,7 @@ LIBNSPR_CONF_ENV = \ # NSPR mixes up --build and --host LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME) LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit -LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6 +LIBNSPR_CONF_OPTS += --enable-ipv6
libnspr is an autotools package, so this is passed in the standard autocomf options. You can drop it from here.
[--SNIP--]
package/netsnmp/netsnmp.mk NETSNMP_CONF_OPTS = \ · line 20
Quoted 10 lines
package/netsnmp/netsnmp.mk +1
-1@@ -17,7 +17,7 @@ NETSNMP_CONF_OPTS = \ --enable-mini-agent \ --without-rpm \ --with-logfile=none \ - --without-kmem-usage $(DISABLE_IPV6) \ + --without-kmem-usage \
Ah, I see you removed it here. I still think it would be better to remove it at the time you ditch DISABLE_IPV6.
[--SNIP--]
package/proftpd/proftpd.mk PROFTPD_MAKE = $(MAKE1) · line 52
Quoted 10 lines
package/proftpd/proftpd.mk +0
-2@@ -48,8 +48,7 @@ PROFTPD_MAKE = $(MAKE1) define PROFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd - $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \ - $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;)
This is telling me that the nit about lighttpd I talked about in my review of the previous patch, should be dropped.
[--SNIP--]
package/systemd/Config.in config BR2_PACKAGE_SYSTEMD · line 14
Quoted 9 lines
package/systemd/Config.in +0
-1@@ -11,7 +11,6 @@ config BR2_PACKAGE_SYSTEMD bool "systemd" depends on BR2_INIT_SYSTEMD depends on BR2_USE_WCHAR # util-linux - depends on BR2_INET_IPV6
As I said previously, this should have been folded in your patch 9/14 (system: drop IPv6 depend for systemd).
[--SNIP--]
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 13/14 package/uclibc: drop BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
In reply to Gustavo ZacariasKill the option to build the non-IPv6 variant and remove the hidden option since it's now unused.
Signed-off-by Gustavo Zacarias <[email protected]>
--- package/uclibc/Config.in | 4 ---- package/uclibc/uclibc.mk | 4 ---- 2 files changed, 8 deletions(-)
package/uclibc/Config.in +0 -4
@@ -86,10 +86,6 @@ config BR2_UCLIBC_CONFIG See also docs/README in this package. If unsure, use the default. -config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6 - bool - default y - config BR2_TOOLCHAIN_BUILDROOT_INET_RPC bool "Enable RPC support" select BR2_TOOLCHAIN_HAS_NATIVE_RPC
package/uclibc/uclibc.mk +0 -4
@@ -212,11 +212,7 @@ endif # IPv6 # -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y) UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) -else -UCLIBC_IPV6_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) -endif # # RPC
Signature · 1 line
2.0.5
PATCH 13/14 package/uclibc: drop BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 4 lines
Kill the option to build the non-IPv6 variant and remove the hidden option since it's now unused.
Signed-off-by Gustavo Zacarias <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 43 lines
--- package/uclibc/Config.in | 4 ---- package/uclibc/uclibc.mk | 4 ---- 2 files changed, 8 deletions(-)package/uclibc/Config.in +0
-4@@ -86,10 +86,6 @@ config BR2_UCLIBC_CONFIG See also docs/README in this package. If unsure, use the default. -config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6 - bool - default y - config BR2_TOOLCHAIN_BUILDROOT_INET_RPC bool "Enable RPC support" select BR2_TOOLCHAIN_HAS_NATIVE_RPCpackage/uclibc/uclibc.mk +0
-4@@ -212,11 +212,7 @@ endif # IPv6 # -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y) UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) -else -UCLIBC_IPV6_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) -endif # # RPCSignature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 14/14 toolchain-common: drop BR2_INET_IPV6
In reply to Gustavo ZacariasIt's now unused so farewell.
Signed-off-by Gustavo Zacarias <[email protected]>
--- toolchain/toolchain-common.in | 4 ---- 1 file changed, 4 deletions(-)
toolchain/toolchain-common.in +0 -4
@@ -5,10 +5,6 @@ # so put it here instead source "package/gdb/Config.in.host" -config BR2_INET_IPV6 - bool - default y - config BR2_TOOLCHAIN_HAS_GCC_BUG_58595 bool
Signature · 1 line
2.0.5
PATCH 14/14 toolchain-common: drop BR2_INET_IPV6
Gustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 3 lines
It's now unused so farewell.
Signed-off-by Gustavo Zacarias <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 26 lines
--- toolchain/toolchain-common.in | 4 ---- 1 file changed, 4 deletions(-)toolchain/toolchain-common.in +0
-4@@ -5,10 +5,6 @@ # so put it here instead source "package/gdb/Config.in.host" -config BR2_INET_IPV6 - bool - default y - config BR2_TOOLCHAIN_HAS_GCC_BUG_58595 boolSignature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/14 toolchain/helpers: make IPv6 mandatory for uclibc toolchains
In reply to Gustavo ZacariasGustavo, All,
On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
Quoted 5 lines
As previously discussed drop the non-IPv6 option for toolchains. The size delta is about 10 KiB and it just complicates package dependencies.
Signed-off-by Gustavo Zacarias <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 24 lines
--- toolchain/helpers.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)toolchain/helpers.mk +1
-1@@ -284,7 +284,7 @@ check_uclibc = \ UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \ $(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\ - $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\Signature · 6 lines
2.0.5 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'