[Buildroot] [RESEND][PATCH v2 1/3] toolchain: configs: improve toolchain config readability

[Buildroot] [RESEND][PATCH v2 1/3] toolchain: configs: improve toolchain config readability

[Petri Gynther]

Add (or move) comment lines in toolchain-related Config.in files
to improve readability of the toolchain config section.

Source linux-headers/Config.in.host after toolchain-buildroot items.

For toolchain-buildroot case, the config file now looks like this:
*
* Toolchain
*

*
* Toolchain Buildroot Options
*

*
* Kernel Header Options
*

*
* uClibc Options
*

*
* Binutils Options
*

*
* GCC Options
*

*
* Host GDB Options
*

*
* Toolchain Generic Options
*

Signed-off-by: Petri Gynther <pgynther@google.com>
---
 package/gdb/Config.in.host              | 2 ++
 package/linux-headers/Config.in.host    | 4 ++--
 package/uclibc/Config.in                | 4 ++--
 toolchain/toolchain-buildroot/Config.in | 5 +++--
 toolchain/toolchain-common.in           | 2 ++
 toolchain/toolchain-external/Config.in  | 2 ++
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index 081073b..a36dc0f 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -1,3 +1,5 @@
+comment "Host GDB Options"
+
 config BR2_PACKAGE_HOST_GDB
 	bool "Build cross gdb for the host"
 	# When the external toolchain gdbserver is used, we shouldn't
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index ae5cc5d..93946ac 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -1,8 +1,8 @@
+comment "Kernel Header Options"
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS
 	bool
 
-comment "Kernel Header Options"
-
 choice
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 7c99195..6c16ed4 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -1,12 +1,12 @@
 if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 
+comment "uClibc Options"
+
 config BR2_PACKAGE_UCLIBC
 	bool
 	default y
 	select BR2_PACKAGE_LINUX_HEADERS
 
-comment "uClibc Options"
-
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
 	default "package/uclibc/uClibc-ng.config"
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 0b97bbf..e713d74 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -2,6 +2,8 @@
 
 if BR2_TOOLCHAIN_BUILDROOT
 
+comment "Toolchain Buildroot Options"
+
 config BR2_TOOLCHAIN_BUILDROOT_VENDOR
 	string "custom toolchain vendor name"
 	default "buildroot"
@@ -18,8 +20,6 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR
 
 	  If you're not sure, just leave the default "buildroot" value.
 
-source "package/linux-headers/Config.in.host"
-
 choice
 	prompt "C library"
 	default BR2_TOOLCHAIN_UCLIBC
@@ -90,6 +90,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LIBC
 	default "glibc"  if BR2_TOOLCHAIN_BUILDROOT_GLIBC
 	default "musl"	 if BR2_TOOLCHAIN_BUILDROOT_MUSL
 
+source "package/linux-headers/Config.in.host"
 source "package/linux-headers/Config.in"
 source "package/musl/Config.in"
 source "package/uclibc/Config.in"
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 03fa880..ccf259a 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -5,6 +5,8 @@
 # so put it here instead
 source "package/gdb/Config.in.host"
 
+comment "Toolchain Generic Options"
+
 # https://sourceware.org/bugzilla/show_bug.cgi?id=19405
 config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
 	bool
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index f54fbee..bb0dde1 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -1,5 +1,7 @@
 if BR2_TOOLCHAIN_EXTERNAL
 
+comment "Toolchain External Options"
+
 choice
 	prompt "Toolchain"
 
-- 
2.8.0.rc3.226.g39d4020

[Buildroot] [RESEND][PATCH v2 2/3] gcc: configs: rename BR2_EXTRA_GCC_CONFIG_OPTIONS

[Petri Gynther]

Rename BR2_EXTRA_GCC_CONFIG_OPTIONS to BR2_GCC_EXTRA_CONFIG_OPTIONS
to be consistent with BR2_GCC_* and BR2_BINUTILS_EXTRA_CONFIG_OPTIONS.

Signed-off-by: Petri Gynther <pgynther@google.com>
---
 Config.in.legacy                       | 14 ++++++++++++++
 package/gcc/Config.in.host             |  3 ++-
 package/gcc/gcc-final/gcc-final.mk     |  2 +-
 package/gcc/gcc-initial/gcc-initial.mk |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 746b80a..4287b61 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -143,6 +143,20 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in master"
+
+config BR2_EXTRA_GCC_CONFIG_OPTIONS
+	string "gcc extra config options has been renamed"
+	default ""
+	help
+	  BR2_EXTRA_GCC_CONFIG_OPTIONS has been renamed to BR2_GCC_EXTRA_CONFIG_OPTIONS
+
+config BR2_EXTRA_GCC_CONFIG_OPTIONS_WRAP
+	bool
+	default y if BR2_EXTRA_GCC_CONFIG_OPTIONS != ""
+	select BR2_LEGACY
+
+###############################################################################
 comment "Legacy options removed in 2016.08"
 
 config BR2_PACKAGE_SYSTEMD_COMPAT
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 2b54959..ec272d2 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -109,8 +109,9 @@ config BR2_GCC_VERSION
 	default "6.1.0" if BR2_GCC_VERSION_6_X
 	default "arc-2016.09-eng007" if BR2_GCC_VERSION_4_8_ARC
 
-config BR2_EXTRA_GCC_CONFIG_OPTIONS
+config BR2_GCC_EXTRA_CONFIG_OPTIONS
 	string "Additional gcc options"
+	default BR2_EXTRA_GCC_CONFIG_OPTIONS if BR2_EXTRA_GCC_CONFIG_OPTIONS != ""
 	default ""
 	help
 	  Any additional gcc configure options you may want to
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 284d34c..0c0ab35 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -90,7 +90,7 @@ endif
 # End with user-provided options, so that they can override previously
 # defined options.
 HOST_GCC_FINAL_CONF_OPTS += \
-	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
+	$(call qstrip,$(BR2_GCC_EXTRA_CONFIG_OPTIONS))
 
 HOST_GCC_FINAL_CONF_ENV = \
 	$(HOST_GCC_COMMON_CONF_ENV)
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index 1e58d8b..0fba9fb 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -47,7 +47,7 @@ HOST_GCC_INITIAL_CONF_OPTS = \
 	--with-newlib \
 	--disable-largefile \
 	--disable-nls \
-	$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
+	$(call qstrip,$(BR2_GCC_EXTRA_CONFIG_OPTIONS))
 
 HOST_GCC_INITIAL_CONF_ENV = \
 	$(HOST_GCC_COMMON_CONF_ENV)
-- 
2.8.0.rc3.226.g39d4020

[Buildroot] [RESEND][PATCH v2 3/3] uclibc: configs: rename BR2_PTHREAD_DEBUG

[Petri Gynther]

Rename BR2_PTHREAD_DEBUG to BR2_PTHREADS_DEBUG to be consistent
with BR2_PTHREADS_* config item naming.

Signed-off-by: Petri Gynther <pgynther@google.com>
---
 Config.in.legacy                                 | 7 +++++++
 configs/atmel_sama5d2_xplained_mmc_dev_defconfig | 2 +-
 configs/atmel_sama5d3_xplained_dev_defconfig     | 2 +-
 configs/atmel_sama5d3_xplained_mmc_dev_defconfig | 2 +-
 configs/atmel_sama5d4_xplained_dev_defconfig     | 2 +-
 configs/atmel_sama5d4_xplained_mmc_dev_defconfig | 2 +-
 package/uclibc/Config.in                         | 2 +-
 package/uclibc/uclibc.mk                         | 2 +-
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 4287b61..dda8d15 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
 ###############################################################################
 comment "Legacy options removed in master"
 
+config BR2_PTHREAD_DEBUG
+	bool "pthreads debug option has been renamed"
+	select BR2_LEGACY
+	select BR2_PTHREADS_DEBUG
+	help
+	  BR2_PTHREAD_DEBUG has been renamed to BR2_PTHREADS_DEBUG
+
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	string "gcc extra config options has been renamed"
 	default ""
diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig
index d7f4717..aa52bd0 100644
--- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig
+++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig
@@ -10,7 +10,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
-BR2_PTHREAD_DEBUG=y
+BR2_PTHREADS_DEBUG=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig
index d51a141..220c941 100644
--- a/configs/atmel_sama5d3_xplained_dev_defconfig
+++ b/configs/atmel_sama5d3_xplained_dev_defconfig
@@ -9,7 +9,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
-BR2_PTHREAD_DEBUG=y
+BR2_PTHREADS_DEBUG=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig
index c45c2ce..e360cfb 100644
--- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig
+++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig
@@ -9,7 +9,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
-BR2_PTHREAD_DEBUG=y
+BR2_PTHREADS_DEBUG=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig
index 7dadeca..cad4eb1 100644
--- a/configs/atmel_sama5d4_xplained_dev_defconfig
+++ b/configs/atmel_sama5d4_xplained_dev_defconfig
@@ -10,7 +10,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
-BR2_PTHREAD_DEBUG=y
+BR2_PTHREADS_DEBUG=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig
index 9e11efa..1738a9a 100644
--- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig
+++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig
@@ -10,7 +10,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
-BR2_PTHREAD_DEBUG=y
+BR2_PTHREADS_DEBUG=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 6c16ed4..e459f44 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -69,7 +69,7 @@ choice
 		depends on !BR2_m68k && !BR2_microblaze
 endchoice
 
-config BR2_PTHREAD_DEBUG
+config BR2_PTHREADS_DEBUG
 	bool "Thread library debugging"
 	depends on BR2_PTHREADS || BR2_PTHREADS_NATIVE
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 124bd59..6fd0768 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -353,7 +353,7 @@ endif
 # Thread debug
 #
 
-ifeq ($(BR2_PTHREAD_DEBUG),y)
+ifeq ($(BR2_PTHREADS_DEBUG),y)
 UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config)
 else
 UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config)
-- 
2.8.0.rc3.226.g39d4020

[Buildroot] [RESEND][PATCH v2 1/3] toolchain: configs: improve toolchain config readability

[Petri Gynther]

On Mon, Aug 8, 2016 at 11:34 AM, Petri Gynther <pgynther@google.com> wrote:
> Add (or move) comment lines in toolchain-related Config.in files
> to improve readability of the toolchain config section.
>
> Source linux-headers/Config.in.host after toolchain-buildroot items.
>
> For toolchain-buildroot case, the config file now looks like this:
> *
> * Toolchain
> *
>
> *
> * Toolchain Buildroot Options
> *
>
> *
> * Kernel Header Options
> *
>
> *
> * uClibc Options
> *
>
> *
> * Binutils Options
> *
>
> *
> * GCC Options
> *
>
> *
> * Host GDB Options
> *
>
> *
> * Toolchain Generic Options
> *
>
> Signed-off-by: Petri Gynther <pgynther@google.com>
> ---
>  package/gdb/Config.in.host              | 2 ++
>  package/linux-headers/Config.in.host    | 4 ++--
>  package/uclibc/Config.in                | 4 ++--
>  toolchain/toolchain-buildroot/Config.in | 5 +++--
>  toolchain/toolchain-common.in           | 2 ++
>  toolchain/toolchain-external/Config.in  | 2 ++
>  6 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
> index 081073b..a36dc0f 100644
> --- a/package/gdb/Config.in.host
> +++ b/package/gdb/Config.in.host
> @@ -1,3 +1,5 @@
> +comment "Host GDB Options"
> +
>  config BR2_PACKAGE_HOST_GDB
>         bool "Build cross gdb for the host"
>         # When the external toolchain gdbserver is used, we shouldn't
> diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
> index ae5cc5d..93946ac 100644
> --- a/package/linux-headers/Config.in.host
> +++ b/package/linux-headers/Config.in.host
> @@ -1,8 +1,8 @@
> +comment "Kernel Header Options"
> +
>  config BR2_PACKAGE_HOST_LINUX_HEADERS
>         bool
>
> -comment "Kernel Header Options"
> -
>  choice
>         prompt "Kernel Headers"
>         default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
> diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
> index 7c99195..6c16ed4 100644
> --- a/package/uclibc/Config.in
> +++ b/package/uclibc/Config.in
> @@ -1,12 +1,12 @@
>  if BR2_TOOLCHAIN_BUILDROOT_UCLIBC
>
> +comment "uClibc Options"
> +
>  config BR2_PACKAGE_UCLIBC
>         bool
>         default y
>         select BR2_PACKAGE_LINUX_HEADERS
>
> -comment "uClibc Options"
> -
>  config BR2_UCLIBC_CONFIG
>         string "uClibc configuration file to use?"
>         default "package/uclibc/uClibc-ng.config"
> diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
> index 0b97bbf..e713d74 100644
> --- a/toolchain/toolchain-buildroot/Config.in
> +++ b/toolchain/toolchain-buildroot/Config.in
> @@ -2,6 +2,8 @@
>
>  if BR2_TOOLCHAIN_BUILDROOT
>
> +comment "Toolchain Buildroot Options"
> +
>  config BR2_TOOLCHAIN_BUILDROOT_VENDOR
>         string "custom toolchain vendor name"
>         default "buildroot"
> @@ -18,8 +20,6 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR
>
>           If you're not sure, just leave the default "buildroot" value.
>
> -source "package/linux-headers/Config.in.host"
> -
>  choice
>         prompt "C library"
>         default BR2_TOOLCHAIN_UCLIBC
> @@ -90,6 +90,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LIBC
>         default "glibc"  if BR2_TOOLCHAIN_BUILDROOT_GLIBC
>         default "musl"   if BR2_TOOLCHAIN_BUILDROOT_MUSL
>
> +source "package/linux-headers/Config.in.host"
>  source "package/linux-headers/Config.in"
>  source "package/musl/Config.in"
>  source "package/uclibc/Config.in"
> diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
> index 03fa880..ccf259a 100644
> --- a/toolchain/toolchain-common.in
> +++ b/toolchain/toolchain-common.in
> @@ -5,6 +5,8 @@
>  # so put it here instead
>  source "package/gdb/Config.in.host"
>
> +comment "Toolchain Generic Options"
> +
>  # https://sourceware.org/bugzilla/show_bug.cgi?id=19405
>  config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
>         bool
> diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
> index f54fbee..bb0dde1 100644
> --- a/toolchain/toolchain-external/Config.in
> +++ b/toolchain/toolchain-external/Config.in
> @@ -1,5 +1,7 @@
>  if BR2_TOOLCHAIN_EXTERNAL
>
> +comment "Toolchain External Options"
> +
>  choice
>         prompt "Toolchain"
>
> --
> 2.8.0.rc3.226.g39d4020ether_addr_equal_unaligned
>

Any comments on this? It is a very trivial patch, yet it makes the
toolchain-related sections in .config file more readable.

[Buildroot] [RESEND][PATCH v2 1/3] toolchain: configs: improve toolchain config readability

[Thomas Petazzoni]

Hello,

On Mon,  8 Aug 2016 11:34:59 -0700, Petri Gynther wrote:
> Add (or move) comment lines in toolchain-related Config.in files
> to improve readability of the toolchain config section.
> 
> Source linux-headers/Config.in.host after toolchain-buildroot items.
> 
> For toolchain-buildroot case, the config file now looks like this:
> *
> * Toolchain
> *
> 
> *
> * Toolchain Buildroot Options
> *
> 
> *
> * Kernel Header Options
> *
> 
> *
> * uClibc Options
> *
> 
> *
> * Binutils Options
> *
> 
> *
> * GCC Options
> *
> 
> *
> * Host GDB Options
> *
> 
> *
> * Toolchain Generic Options
> *
> 
> Signed-off-by: Petri Gynther <pgynther@google.com>
> ---
>  package/gdb/Config.in.host              | 2 ++
>  package/linux-headers/Config.in.host    | 4 ++--
>  package/uclibc/Config.in                | 4 ++--
>  toolchain/toolchain-buildroot/Config.in | 5 +++--
>  toolchain/toolchain-common.in           | 2 ++
>  toolchain/toolchain-external/Config.in  | 2 ++
>  6 files changed, 13 insertions(+), 6 deletions(-)

Applied to master, thanks.

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

[Buildroot] [RESEND][PATCH v2 2/3] gcc: configs: rename BR2_EXTRA_GCC_CONFIG_OPTIONS

[Thomas Petazzoni]

Hello,

On Mon,  8 Aug 2016 11:35:00 -0700, Petri Gynther wrote:
> Rename BR2_EXTRA_GCC_CONFIG_OPTIONS to BR2_GCC_EXTRA_CONFIG_OPTIONS
> to be consistent with BR2_GCC_* and BR2_BINUTILS_EXTRA_CONFIG_OPTIONS.
> 
> Signed-off-by: Petri Gynther <pgynther@google.com>

I've rejected this patch (2/3) and the following one (3/3). Indeed,
those renames are not really necessary, and renaming options causes
unnecessary breakage of existing configurations. So the benefit of the
rename is too small compared to the breakage for users. I know it's
annoying, I would also prefer to have a more consistent option naming,
but some amount of backward compatibility is more important.

Thanks,

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