[Buildroot] [PATCH 01/80 v1] package/alsa-lib: use 'menuconfig' instead of 'config'+'menu'

[Buildroot] [PATCH 01/80 v1] package/alsa-lib: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/alsa-lib/Config.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index ebca265..97e8489 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -1,7 +1,7 @@
 comment "alsa-lib needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_ALSA_LIB
+menuconfig BR2_PACKAGE_ALSA_LIB
 	bool "alsa-lib"
 	# Temporary until
 	# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
@@ -29,8 +29,6 @@ config BR2_PACKAGE_ALSA_LIB_PYTHON
 	  in the target directory
 	  http://www.alsa-project.org/
 
-menu "ALSA lib selection"
-
 config BR2_PACKAGE_ALSA_LIB_DEVDIR
 	string "directory with ALSA device files"
 	default "/dev/snd"
@@ -77,6 +75,4 @@ config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS
 	bool "old-symbols"
 	default y
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 02/80 v1] package/alsa-utils: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Drop the now useless comment.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - drop comment  (Arnout)
---
 package/alsa-utils/Config.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
index 82f3ad6..ea3c5bd 100644
--- a/package/alsa-utils/Config.in
+++ b/package/alsa-utils/Config.in
@@ -2,7 +2,7 @@ comment "alsa-utils needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU # fork
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
-config BR2_PACKAGE_ALSA_UTILS
+menuconfig BR2_PACKAGE_ALSA_UTILS
 	bool "alsa-utils"
 	depends on BR2_USE_MMU # fork
 	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
@@ -16,7 +16,6 @@ config BR2_PACKAGE_ALSA_UTILS
 	  http://www.alsa-project.org/
 
 if BR2_PACKAGE_ALSA_UTILS
-menu "ALSA utils selection"
 
 config BR2_PACKAGE_ALSA_UTILS_ALSACONF
 	bool "alsaconf"
@@ -89,6 +88,4 @@ config BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST
 	bool "speaker-test"
 	select BR2_PACKAGE_ALSA_LIB_PCM
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 03/80 v1] package/angularjs: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

... and change the modules 'menuconfig' to a simple 'config'

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/angularjs/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/angularjs/Config.in b/package/angularjs/Config.in
index 2b563f7..206b3d8 100644
--- a/package/angularjs/Config.in
+++ b/package/angularjs/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_ANGULARJS
+menuconfig BR2_PACKAGE_ANGULARJS
 	bool "angularjs"
 	help
 	  AngularJS web application framework.
@@ -7,7 +7,7 @@ config BR2_PACKAGE_ANGULARJS
 
 if BR2_PACKAGE_ANGULARJS
 
-menuconfig BR2_ANGULARJS_MODULES
+config BR2_ANGULARJS_MODULES
 	bool "angularjs modules"
 	help
 	  Select which modules to install. If disabled, all modules
-- 
1.9.1

[Buildroot] [PATCH 04/80 v1] package/angularjs: simplify modules selection

[Yann E. MORIN]

Remove the superfluous config option, and make all modules default to
'y', which provides exactly the same functionality.

simplify (and slightly beautify) the handling of modules in the .mk:
since the modules' symbols are always meaningful now, we can get rid of
the else-clause, and always build the list of modules using the Kconfig
options.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - treat the 'angula'r module on its own, as was done previosuly
    (Arnout)
  - drop useless comments in Config.in  (Arnout)
  - don't re-order list, it was already alphabetically sorted
---
 package/angularjs/Config.in    | 19 +++++++++----------
 package/angularjs/angularjs.mk | 21 ++++++++++++++-------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/package/angularjs/Config.in b/package/angularjs/Config.in
index 206b3d8..2a0b48c 100644
--- a/package/angularjs/Config.in
+++ b/package/angularjs/Config.in
@@ -7,16 +7,9 @@ menuconfig BR2_PACKAGE_ANGULARJS
 
 if BR2_PACKAGE_ANGULARJS
 
-config BR2_ANGULARJS_MODULES
-	bool "angularjs modules"
-	help
-	  Select which modules to install. If disabled, all modules
-	  will be installed.
-
-if BR2_ANGULARJS_MODULES
-
 config BR2_ANGULARJS_MODULE_ANIMATE
 	bool "animate"
+	default y
 	help
 	  The ngAnimate module provides support for CSS-based animations
 	  (keyframes and transitions) as well as JavaScript-based animations
@@ -26,6 +19,7 @@ config BR2_ANGULARJS_MODULE_ANIMATE
 
 config BR2_ANGULARJS_MODULE_ARIA
 	bool "aria"
+	default y
 	help
 	  The ngAria module provides support for common ARIA attributes that
 	  convey state or semantic information about the application for users
@@ -33,18 +27,21 @@ config BR2_ANGULARJS_MODULE_ARIA
 
 config BR2_ANGULARJS_MODULE_COOKIES
 	bool "cookies"
+	default y
 	help
 	  The ngCookies module provides a convenient wrapper for reading and
 	  writing browser cookies.
 
 config BR2_ANGULARJS_MODULE_MESSAGE_FORMAT
 	bool "message-format"
+	default y
 	help
 	  The ngMessageFormat module is used recognize MessageFormat extensions
 	  in interpolation expressions.
 
 config BR2_ANGULARJS_MODULE_MESSAGES
 	bool "messages"
+	default y
 	help
 	  The ngMessages module provides enhanced support for displaying
 	  messages within templates (typically within forms or when rendering
@@ -52,28 +49,30 @@ config BR2_ANGULARJS_MODULE_MESSAGES
 
 config BR2_ANGULARJS_MODULE_RESOURCE
 	bool "resource"
+	default y
 	help
 	  The ngResource module provides interaction support with RESTful
 	  services via the $resource service.
 
 config BR2_ANGULARJS_MODULE_ROUTE
 	bool "route"
+	default y
 	help
 	  The ngRoute module provides routing and deeplinking services and
 	  directives for angular apps.
 
 config BR2_ANGULARJS_MODULE_SANITIZE
 	bool "sanitize"
+	default y
 	help
 	  The ngSanitize module provides functionality to sanitize HTML.
 
 config BR2_ANGULARJS_MODULE_TOUCH
 	bool "touch"
+	default y
 	help
 	  The ngTouch module provides touch events and other helpers for
 	  touch-enabled devices. The implementation is based on jQuery Mobile
 	  touch event handling (jquerymobile.com).
 
 endif
-
-endif
diff --git a/package/angularjs/angularjs.mk b/package/angularjs/angularjs.mk
index 60dbdb6..cd9b6c5 100644
--- a/package/angularjs/angularjs.mk
+++ b/package/angularjs/angularjs.mk
@@ -17,18 +17,25 @@ define ANGULARJS_EXTRACT_CMDS
 	rmdir $(@D)/angular-$(ANGULARJS_VERSION)
 endef
 
+# This list mirrors the list of available modules from Config.in.
+# Keep this list in sync and in the same (alphabetical) order as the
+# one in Config.in. However, always keep 'angular' first in the list.
+ANGULARJS_MODULES = \
+	animate \
+	aria \
+	cookies \
+	messages \
+	message-format \
+	resource \
+	route \
+	sanitize \
+	touch
+
 ANGULARJS_FILES = angular
 
-ANGULARJS_MODULES = animate aria cookies message-format messages resource \
-	route sanitize touch
-
-ifeq ($(BR2_ANGULARJS_MODULES),y)
 ANGULARJS_FILES += $(foreach mod,$(ANGULARJS_MODULES),\
 			$(if $(BR2_ANGULARJS_MODULE_$(call UPPERCASE,$(mod))),\
 				angular-$(mod)))
-else
-ANGULARJS_FILES += $(foreach mod,$(ANGULARJS_MODULES),angular-$(mod))
-endif
 
 define ANGULARJS_INSTALL_TARGET_CMDS
 	$(foreach f,$(ANGULARJS_FILES),\
-- 
1.9.1

[Buildroot] [PATCH 05/80 v1] package/collectd: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Since there were multiple sub-menus, keep their prompts as a comment, to
properly separate all famillies of plugins.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/collectd/Config.in | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index ec7e942..2136bdc 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_COLLECTD
+menuconfig BR2_PACKAGE_COLLECTD
 	bool "collectd"
 	# Uses fork()
 	depends on BR2_USE_MMU
@@ -13,7 +13,7 @@ config BR2_PACKAGE_COLLECTD
 
 if BR2_PACKAGE_COLLECTD
 
-menu "match plugins"
+comment "match plugins"
 
 config BR2_PACKAGE_COLLECTD_EMPTY_COUNTER
 	bool "empty counter"
@@ -39,9 +39,8 @@ config BR2_PACKAGE_COLLECTD_VALUE
 	bool "value"
 	help
 	  Select values by their data sources' values.
-endmenu
 
-menu "misc plugins"
+comment "misc plugins"
 
 config BR2_PACKAGE_COLLECTD_AGGREGATION
 	bool "aggregation"
@@ -86,9 +85,7 @@ config BR2_PACKAGE_COLLECTD_THRESHOLD
 	  Checks values against configured thresholds and creates notifications
 	  if values are out of bounds.
 
-endmenu
-
-menu "read plugins"
+comment "read plugins"
 
 comment "Select at least one for collectd to be useful"
 
@@ -455,9 +452,7 @@ config BR2_PACKAGE_COLLECTD_ZOOKEEPER
 	help
 	  Read data from Zookeeper's MNTR command.
 
-endmenu
-
-menu "target plugins"
+comment "target plugins"
 
 config BR2_PACKAGE_COLLECTD_NOTIFICATION
 	bool "notification"
@@ -479,9 +474,7 @@ config BR2_PACKAGE_COLLECTD_SET
 	help
 	  Set (overwrite) entire parts of an identifier.
 
-endmenu
-
-menu "write plugins"
+comment "write plugins"
 
 comment "Select at least one for collectd to be useful"
 
@@ -550,8 +543,6 @@ config BR2_PACKAGE_COLLECTD_WRITETSDB
 	  Sends data OpenTSDB, a scalable no master, no shared state time
 	  series database.
 
-endmenu
-
 endif
 
 comment "collectd needs a toolchain w/ threads, dynamic library"
-- 
1.9.1

[Buildroot] [PATCH 06/80 v1] package/gd: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - typo in title  (Arnout)
---
 package/gd/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/gd/Config.in b/package/gd/Config.in
index e838635..1f466d2 100644
--- a/package/gd/Config.in
+++ b/package/gd/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_GD
+menuconfig BR2_PACKAGE_GD
 	bool "gd"
 	help
 	  GD is a graphics library. It allows your code to quickly
@@ -12,7 +12,7 @@ config BR2_PACKAGE_GD
 
 if BR2_PACKAGE_GD
 
-menu "gd tools"
+comment "gd tools"
 
 config BR2_PACKAGE_GD_ANNOTATE
 	bool "annotate"
@@ -57,6 +57,4 @@ config BR2_PACKAGE_GD_WEBPNG
 	bool "webpng"
 	select BR2_PACKAGE_LIBPNG
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 07/80 v1] package/gpsd: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Since there were multiple sub-menus, their prompts are turned into
comments.

Some option were missing a prompt, so add one. Add separating lines
around options.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/gpsd/Config.in | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in
index b4008eb..876ab9b 100644
--- a/package/gpsd/Config.in
+++ b/package/gpsd/Config.in
@@ -2,7 +2,7 @@ comment "gpsd needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
-config BR2_PACKAGE_GPSD
+menuconfig BR2_PACKAGE_GPSD
 	bool "gpsd"
 	# Uses fork()
 	depends on BR2_USE_MMU
@@ -25,7 +25,7 @@ config BR2_PACKAGE_GPSD_DEVICES
 	string "Where to look for GPSes"
 	default "/dev/ttyS1"
 
-menu "Features"
+comment "Features"
 
 config BR2_PACKAGE_GPSD_CLIENT_DEBUG
 	bool "client debugging support"
@@ -50,36 +50,41 @@ config BR2_PACKAGE_GPSD_PPS
 
 config BR2_PACKAGE_GPSD_USER
 	bool "GPSD privilege revocation user"
+
 config BR2_PACKAGE_GPSD_USER_VALUE
-	string ""
+	string "user to run as"
 	default "nobody"
 	depends on BR2_PACKAGE_GPSD_USER
 
 config BR2_PACKAGE_GPSD_GROUP
 	bool "GPSD privilege revocation group"
+
 config BR2_PACKAGE_GPSD_GROUP_VALUE
-	string ""
+	string "group to run as"
 	default "nobody"
 	depends on BR2_PACKAGE_GPSD_GROUP
 
 config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
 	bool "compile with fixed serial port speed"
+
 config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE
-	string ""
+	int "serial port speed"
 	default "9600"
 	depends on BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
 
 config BR2_PACKAGE_GPSD_MAX_CLIENT
 	bool "compile with limited maximum clients"
+
 config BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE
-	string "compile with limited maximum clients"
+	int "maximum number of clients"
 	default "10"
 	depends on BR2_PACKAGE_GPSD_MAX_CLIENT
 
 config BR2_PACKAGE_GPSD_MAX_DEV
 	bool "compile with maximum allowed devices"
+
 config BR2_PACKAGE_GPSD_MAX_DEV_VALUE
-	string "compile with maximum allowed devices"
+	int "maximum allowed devices"
 	default "2"
 	depends on BR2_PACKAGE_GPSD_MAX_DEV
 
@@ -94,9 +99,7 @@ config BR2_PACKAGE_GPSD_CONTROLSEND
 config BR2_PACKAGE_GPSD_SQUELCH
 	bool "squelch gpsd_report and gpsd_hexdump to save cpu"
 
-endmenu
-
-menu "Protocols"
+comment "Protocols"
 
 config BR2_PACKAGE_GPSD_AIVDM
 	bool "Aivdm"
@@ -231,6 +234,4 @@ config BR2_PACKAGE_GPSD_UBX
 	help
 	  uBlox UBX binary support
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 08/80 v1] package/jquery: include external plugins from jquery's Config.in

[Yann E. MORIN]

... and make it a menuconfig instead of a 'config'+'menu'.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in        | 12 ------------
 package/jquery/Config.in | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 89b23db..48e0c7c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -962,18 +962,6 @@ menu "Javascript"
 	source "package/explorercanvas/Config.in"
 	source "package/flot/Config.in"
 	source "package/jquery/Config.in"
-if BR2_PACKAGE_JQUERY
-menu "External jQuery plugins"
-	source "package/jquery-datetimepicker/Config.in"
-	source "package/jquery-keyboard/Config.in"
-	source "package/jquery-mobile/Config.in"
-	source "package/jquery-sidebar/Config.in"
-	source "package/jquery-sparkline/Config.in"
-	source "package/jquery-ui/Config.in"
-	source "package/jquery-ui-themes/Config.in"
-	source "package/jquery-validation/Config.in"
-endmenu
-endif
 	source "package/jsmin/Config.in"
 	source "package/json-javascript/Config.in"
 endmenu
diff --git a/package/jquery/Config.in b/package/jquery/Config.in
index 92f5604..3133702 100644
--- a/package/jquery/Config.in
+++ b/package/jquery/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_JQUERY
+menuconfig BR2_PACKAGE_JQUERY
 	bool "jQuery"
 	help
 	  jQuery is a fast and concise JavaScript Library that
@@ -6,3 +6,18 @@ config BR2_PACKAGE_JQUERY
 	  animating, and Ajax interactions for rapid web development.
 
 	  http://jquery.com
+
+if BR2_PACKAGE_JQUERY
+
+comment "External jQuery plugins"
+
+source "package/jquery-datetimepicker/Config.in"
+source "package/jquery-keyboard/Config.in"
+source "package/jquery-mobile/Config.in"
+source "package/jquery-sidebar/Config.in"
+source "package/jquery-sparkline/Config.in"
+source "package/jquery-ui/Config.in"
+source "package/jquery-ui-themes/Config.in"
+source "package/jquery-validation/Config.in"
+
+endif
-- 
1.9.1

[Buildroot] [PATCH 09/80 v1] package/libdrm: move tests programs to the bottom

[Yann E. MORIN]

Tests programs are not that important; at least, they're probably less
important than the drivers selection.

Move it down to after the drivers selection.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/libdrm/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 445a85b..ad015f8 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -9,11 +9,6 @@ config BR2_PACKAGE_LIBDRM
 
 if BR2_PACKAGE_LIBDRM
 
-config BR2_PACKAGE_LIBDRM_INSTALL_TESTS
-	bool "Install test programs"
-	help
-	  This option allows to install the libdrm test programs.
-
 menu "DRM Drivers"
 
 config BR2_PACKAGE_LIBDRM_INTEL
@@ -71,6 +66,11 @@ config BR2_PACKAGE_LIBDRM_TEGRA
 
 endmenu
 
+config BR2_PACKAGE_LIBDRM_INSTALL_TESTS
+	bool "Install test programs"
+	help
+	  This option allows to install the libdrm test programs.
+
 endif
 
 comment "libdrm needs a toolchain w/ threads"
-- 
1.9.1

[Buildroot] [PATCH 10/80 v1] package/libdrm: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Transform the menu prompt into a comment.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - drop the comment  (Arnout)
---
 package/libdrm/Config.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index ad015f8..2f9ad7c 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LIBDRM
+menuconfig BR2_PACKAGE_LIBDRM
 	bool "libdrm"
 	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libpthread-stubs
@@ -9,8 +9,6 @@ config BR2_PACKAGE_LIBDRM
 
 if BR2_PACKAGE_LIBDRM
 
-menu "DRM Drivers"
-
 config BR2_PACKAGE_LIBDRM_INTEL
 	bool "intel"
 	select BR2_PACKAGE_LIBATOMIC_OPS
@@ -64,8 +62,6 @@ config BR2_PACKAGE_LIBDRM_TEGRA
 	help
 	  Install NVIDIA Tegra driver using an experimental API.
 
-endmenu
-
 config BR2_PACKAGE_LIBDRM_INSTALL_TESTS
 	bool "Install test programs"
 	help
-- 
1.9.1

[Buildroot] [PATCH 11/80 v1] package/mono: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

This is a bit overkill, as there is only one sub-item. However, this
commit is not about judging whether it makes sense or not to have a
sub-menu, but to cleanup the 'config'+'menu' situation.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in      | 5 -----
 package/mono/Config.in | 8 +++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 48e0c7c..b62f570 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -541,11 +541,6 @@ endif
 	source "package/micropython-lib/Config.in"
 	source "package/moarvm/Config.in"
 	source "package/mono/Config.in"
-if BR2_PACKAGE_MONO
-menu "Mono libraries/modules"
-	source "package/mono-gtksharp3/Config.in"
-endmenu
-endif
 	source "package/nodejs/Config.in"
 	source "package/perl/Config.in"
 if BR2_PACKAGE_PERL
diff --git a/package/mono/Config.in b/package/mono/Config.in
index cf18a03..c00a3fa 100644
--- a/package/mono/Config.in
+++ b/package/mono/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_MONO_ARCH_SUPPORTS
 	default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
 		      BR2_mipsel || BR2_powerpc || BR2_sparc || BR2_x86_64)
 
-config BR2_PACKAGE_MONO
+menuconfig BR2_PACKAGE_MONO
 	bool "mono"
 	depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -14,6 +14,12 @@ config BR2_PACKAGE_MONO
 
 	  http://download.mono-project.com/sources/mono/
 
+if BR2_PACKAGE_MONO
+
+source "package/mono-gtksharp3/Config.in"
+
+endif
+
 comment "mono needs a toolchain w/ threads, dynamic library"
 	depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-- 
1.9.1

[Buildroot] [PATCH 12/80 v1] package/ncftp: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - drop the comment  (Arnout)
---
 package/ncftp/Config.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in
index 57586e7..2569dc5 100644
--- a/package/ncftp/Config.in
+++ b/package/ncftp/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_NCFTP
+menuconfig BR2_PACKAGE_NCFTP
 	bool "ncftp"
 	# fork()
 	depends on BR2_USE_MMU
@@ -10,8 +10,6 @@ config BR2_PACKAGE_NCFTP
 
 if BR2_PACKAGE_NCFTP
 
-menu "ncFTP tools selection"
-
 config BR2_PACKAGE_NCFTP_GET
 	bool "NcFTPGet - command-line utility program"
 	default y
@@ -32,6 +30,4 @@ config BR2_PACKAGE_NCFTP_BOOKMARKS
 	bool "NcFTPBookmarks - ncurses based Bookmark Editor"
 	select BR2_PACKAGE_NCURSES
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 13/80 v1] package/nfs-utils: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/nfs-utils/Config.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index 1273092..7476fdb 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -2,7 +2,7 @@ comment "nfs-utils needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_NFS_UTILS
+menuconfig BR2_PACKAGE_NFS_UTILS
 	bool "nfs-utils"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -15,8 +15,6 @@ config BR2_PACKAGE_NFS_UTILS
 
 if BR2_PACKAGE_NFS_UTILS
 
-menu "NFS utilities selection"
-
 config BR2_PACKAGE_NFS_UTILS_RPCDEBUG
 	bool "rpcdebug"
 	help
@@ -32,6 +30,4 @@ config BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD
 	help
 	  NFS remote quota server
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 14/80 v1] package/nodejs: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1;
  - drop the comment  (Arnout)
---
 package/nodejs/Config.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 3dfccac..702ea38 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -5,7 +5,7 @@ comment "nodejs needs a toolchain w/ C++, dynamic library, threads"
 	depends on !BR2_ARM_CPU_ARMV4
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_NODEJS
+menuconfig BR2_PACKAGE_NODEJS
 	bool "nodejs"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -64,8 +64,6 @@ config BR2_PACKAGE_NODEJS_VERSION_STRING
 	default "0.10.41"	if BR2_PACKAGE_NODEJS_0_10_X
 	default "5.3.0"		if BR2_PACKAGE_NODEJS_5_X
 
-menu "Module Selection"
-
 config BR2_PACKAGE_NODEJS_NPM
 	bool "NPM for the target"
 	select BR2_PACKAGE_OPENSSL
@@ -120,6 +118,4 @@ config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS
 	  'libcurl' here, to ensure that buildroot builds the libcurl package,
 	  and does so before building your node modules.
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 15/80 v1] package/ola: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Since there were multiple sub-menus, their prompts are turned into
comments.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/ola/Config.in | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/package/ola/Config.in b/package/ola/Config.in
index fd693de..fb96e11 100644
--- a/package/ola/Config.in
+++ b/package/ola/Config.in
@@ -3,7 +3,7 @@ comment "ola needs a toolchain w/ C++, threads, wchar, dynamic library"
 		|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 	depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64
 
-config BR2_PACKAGE_OLA
+menuconfig BR2_PACKAGE_OLA
 	bool "ola (open lighting architecture)"
 	select BR2_PACKAGE_PROTOBUF
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -24,7 +24,7 @@ config BR2_PACKAGE_OLA
 
 if BR2_PACKAGE_OLA
 
-menu "bindings and interface"
+comment "bindings and interface"
 
 config BR2_PACKAGE_OLA_WEB
 	bool "http interface"
@@ -44,9 +44,7 @@ config BR2_PACKAGE_OLA_SLP
 	help
 	  Build OLA with slp tools.
 
-endmenu
-
-menu "tests and examples"
+comment "tests and examples"
 
 config BR2_PACKAGE_OLA_EXAMPLES
 	bool "examples"
@@ -60,9 +58,7 @@ config BR2_PACKAGE_OLA_RDM_TESTS
 	help
 	  Build OLA RDM tests.
 
-endmenu
-
-menu "plugin selections"
+comment "plugin selections"
 
 config BR2_PACKAGE_OLA_PLUGIN_E131
 	bool "acn E131"
@@ -132,6 +128,4 @@ config BR2_PACKAGE_OLA_PLUGIN_USBPRO
 	help
 	  Build UsbPro plugin for OLA.
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 16/80 v1] package/perl: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Move the perl library/modules inclusion to the perl's Config.in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in      | 47 -----------------------------------------------
 package/perl/Config.in | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index b62f570..6fd68a8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -543,53 +543,6 @@ endif
 	source "package/mono/Config.in"
 	source "package/nodejs/Config.in"
 	source "package/perl/Config.in"
-if BR2_PACKAGE_PERL
-menu "Perl libraries/modules"
-	source "package/perl-crypt-openssl-random/Config.in"
-	source "package/perl-crypt-openssl-rsa/Config.in"
-	source "package/perl-datetime-tiny/Config.in"
-	source "package/perl-db-file/Config.in"
-	source "package/perl-digest-hmac/Config.in"
-	source "package/perl-digest-sha1/Config.in"
-	source "package/perl-encode-detect/Config.in"
-	source "package/perl-encode-locale/Config.in"
-	source "package/perl-file-listing/Config.in"
-	source "package/perl-file-util/Config.in"
-	source "package/perl-gd/Config.in"
-	source "package/perl-gdgraph/Config.in"
-	source "package/perl-gdtextutil/Config.in"
-	source "package/perl-html-parser/Config.in"
-	source "package/perl-html-tagset/Config.in"
-	source "package/perl-http-cookies/Config.in"
-	source "package/perl-http-daemon/Config.in"
-	source "package/perl-http-date/Config.in"
-	source "package/perl-http-message/Config.in"
-	source "package/perl-http-negotiate/Config.in"
-	source "package/perl-io-html/Config.in"
-	source "package/perl-io-socket-ssl/Config.in"
-	source "package/perl-json-tiny/Config.in"
-	source "package/perl-libwww-perl/Config.in"
-	source "package/perl-lwp-mediatypes/Config.in"
-	source "package/perl-mail-dkim/Config.in"
-	source "package/perl-mailtools/Config.in"
-	source "package/perl-mime-base64/Config.in"
-	source "package/perl-mojolicious/Config.in"
-	source "package/perl-net-dns/Config.in"
-	source "package/perl-net-http/Config.in"
-	source "package/perl-net-ssleay/Config.in"
-	source "package/perl-netaddr-ip/Config.in"
-	source "package/perl-path-tiny/Config.in"
-	source "package/perl-time-hires/Config.in"
-	source "package/perl-timedate/Config.in"
-	source "package/perl-try-tiny/Config.in"
-	source "package/perl-uri/Config.in"
-	source "package/perl-www-robotrules/Config.in"
-	source "package/perl-xml-libxml/Config.in"
-	source "package/perl-xml-namespacesupport/Config.in"
-	source "package/perl-xml-sax/Config.in"
-	source "package/perl-xml-sax-base/Config.in"
-endmenu
-endif
 	source "package/php/Config.in"
 if BR2_PACKAGE_PHP
 if !BR2_STATIC_LIBS
diff --git a/package/perl/Config.in b/package/perl/Config.in
index cdd5aab..635a6f8 100644
--- a/package/perl/Config.in
+++ b/package/perl/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_PERL
+menuconfig BR2_PACKAGE_PERL
 	bool "perl"
 	depends on BR2_USE_MMU # fork()
 	help
@@ -24,4 +24,50 @@ config BR2_PACKAGE_PERL_MODULES
 	  Leave empty for all modules (as far as the external libraries
 	  are available).
 
+comment "Perl libraries/modules"
+
+source "package/perl-crypt-openssl-random/Config.in"
+source "package/perl-crypt-openssl-rsa/Config.in"
+source "package/perl-datetime-tiny/Config.in"
+source "package/perl-db-file/Config.in"
+source "package/perl-digest-hmac/Config.in"
+source "package/perl-digest-sha1/Config.in"
+source "package/perl-encode-detect/Config.in"
+source "package/perl-encode-locale/Config.in"
+source "package/perl-file-listing/Config.in"
+source "package/perl-file-util/Config.in"
+source "package/perl-gd/Config.in"
+source "package/perl-gdgraph/Config.in"
+source "package/perl-gdtextutil/Config.in"
+source "package/perl-html-parser/Config.in"
+source "package/perl-html-tagset/Config.in"
+source "package/perl-http-cookies/Config.in"
+source "package/perl-http-daemon/Config.in"
+source "package/perl-http-date/Config.in"
+source "package/perl-http-message/Config.in"
+source "package/perl-http-negotiate/Config.in"
+source "package/perl-io-html/Config.in"
+source "package/perl-io-socket-ssl/Config.in"
+source "package/perl-json-tiny/Config.in"
+source "package/perl-libwww-perl/Config.in"
+source "package/perl-lwp-mediatypes/Config.in"
+source "package/perl-mail-dkim/Config.in"
+source "package/perl-mailtools/Config.in"
+source "package/perl-mime-base64/Config.in"
+source "package/perl-mojolicious/Config.in"
+source "package/perl-net-dns/Config.in"
+source "package/perl-net-http/Config.in"
+source "package/perl-net-ssleay/Config.in"
+source "package/perl-netaddr-ip/Config.in"
+source "package/perl-path-tiny/Config.in"
+source "package/perl-time-hires/Config.in"
+source "package/perl-timedate/Config.in"
+source "package/perl-try-tiny/Config.in"
+source "package/perl-uri/Config.in"
+source "package/perl-www-robotrules/Config.in"
+source "package/perl-xml-libxml/Config.in"
+source "package/perl-xml-namespacesupport/Config.in"
+source "package/perl-xml-sax/Config.in"
+source "package/perl-xml-sax-base/Config.in"
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 17/80 v1] package/php: move list of extensions after interface selection

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/php/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/php/Config.in b/package/php/Config.in
index 32faa32..eee8d26 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -9,8 +9,6 @@ config BR2_PACKAGE_PHP
 
 if BR2_PACKAGE_PHP
 
-source "package/php/Config.ext"
-
 config BR2_PACKAGE_PHP_CLI
 	bool
 
@@ -66,4 +64,6 @@ config BR2_PACKAGE_PHP_SAPI_CLI_FPM
 
 endchoice
 
+source "package/php/Config.ext"
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 18/80 v1] package/php: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Move the external extensions selection into the bundled extensions'
Config.in.

Make the menu prompt a comment, reword it so that it is more in line
with the following comments.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in      | 16 ----------------
 package/php/Config.ext | 20 ++++++++++++++++++--
 package/php/Config.in  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 6fd68a8..91c96ea 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -544,22 +544,6 @@ endif
 	source "package/nodejs/Config.in"
 	source "package/perl/Config.in"
 	source "package/php/Config.in"
-if BR2_PACKAGE_PHP
-if !BR2_STATIC_LIBS
-menu "External php extensions"
-	source "package/php-geoip/Config.in"
-	source "package/php-gnupg/Config.in"
-	source "package/php-imagick/Config.in"
-	source "package/php-memcached/Config.in"
-	source "package/php-ssh2/Config.in"
-	source "package/php-yaml/Config.in"
-	source "package/php-zmq/Config.in"
-endmenu
-endif
-if BR2_STATIC_LIBS
-comment "External PHP extensions need a toolchain w/ dynamic library"
-endif
-endif
 	source "package/python/Config.in"
 	source "package/python3/Config.in"
 if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
diff --git a/package/php/Config.ext b/package/php/Config.ext
index c044e45..a93086f 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -1,4 +1,4 @@
-menu "Extensions"
+comment "Generic extensions"
 
 config BR2_PACKAGE_PHP_EXT_CALENDAR
 	bool "Calendar"
@@ -401,4 +401,20 @@ config BR2_PACKAGE_PHP_EXT_XSL
 	help
 	  XSL transformation support
 
-endmenu
+if !BR2_STATIC_LIBS
+
+comment "External extensions"
+
+source "package/php-geoip/Config.in"
+source "package/php-gnupg/Config.in"
+source "package/php-imagick/Config.in"
+source "package/php-memcached/Config.in"
+source "package/php-ssh2/Config.in"
+source "package/php-yaml/Config.in"
+source "package/php-zmq/Config.in"
+
+endif # !STATIC_LIBS
+
+if BR2_STATIC_LIBs
+comment "External PHP extensions need a toolchain w/ dynamic library"
+endif
diff --git a/package/php/Config.in b/package/php/Config.in
index eee8d26..7e79179 100644
--- a/package/php/Config.in
+++ b/package/php/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_PHP
+menuconfig BR2_PACKAGE_PHP
 	bool "php"
 	help
 	  PHP  is a widely-used general-purpose scripting
-- 
1.9.1

[Buildroot] [PATCH 19/80 v1] package/python: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/python/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/python/Config.in b/package/python/Config.in
index fa83e77..40a2ef4 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -2,7 +2,7 @@ comment "python needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
-config BR2_PACKAGE_PYTHON
+menuconfig BR2_PACKAGE_PYTHON
 	bool "python"
 	depends on BR2_USE_WCHAR
 	# uses fork()
@@ -34,7 +34,7 @@ config BR2_PACKAGE_PYTHON_PY_PYC
 
 endchoice
 
-menu "core python modules"
+comment "core python modules"
 
 comment "The following modules are unusual or require extra libraries"
 
@@ -127,6 +127,4 @@ config BR2_PACKAGE_PYTHON_HASHLIB
 	help
 	  hashlib support in Python
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 20/80 v1] package/python3: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/python3/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/python3/Config.in b/package/python3/Config.in
index 0f4fc88..aadc8b6 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -2,7 +2,7 @@ comment "python3 needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
-config BR2_PACKAGE_PYTHON3
+menuconfig BR2_PACKAGE_PYTHON3
 	bool "python3"
 	depends on !BR2_PACKAGE_PYTHON
 	depends on BR2_USE_WCHAR
@@ -35,7 +35,7 @@ config BR2_PACKAGE_PYTHON3_PY_PYC
 
 endchoice
 
-menu "core python3 modules"
+comment "core python3 modules"
 
 comment "The following modules are unusual or require extra libraries"
 
@@ -104,6 +104,4 @@ config BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  zlib support in Python3
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 21/80 v1] package/python{, 3}: move inclusion of external python modules

[Yann E. MORIN]

Introduce a Config.ext for external python modules, that both python and
python include from there respective sub-menus.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in          | 98 ----------------------------------------------
 package/python/Config.ext  | 98 ++++++++++++++++++++++++++++++++++++++++++++++
 package/python/Config.in   |  2 +
 package/python3/Config.ext |  1 +
 package/python3/Config.in  |  2 +
 5 files changed, 103 insertions(+), 98 deletions(-)
 create mode 100644 package/python/Config.ext
 create mode 120000 package/python3/Config.ext

diff --git a/package/Config.in b/package/Config.in
index 91c96ea..531b1a0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -546,104 +546,6 @@ endif
 	source "package/php/Config.in"
 	source "package/python/Config.in"
 	source "package/python3/Config.in"
-if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
-menu "External python modules"
-	source "package/python-alsaaudio/Config.in"
-	source "package/python-backports-abc/Config.in"
-	source "package/python-bottle/Config.in"
-	source "package/python-can/Config.in"
-	source "package/python-certifi/Config.in"
-	source "package/python-cffi/Config.in"
-	source "package/python-cheetah/Config.in"
-	source "package/python-cherrypy/Config.in"
-	source "package/python-coherence/Config.in"
-	source "package/python-configobj/Config.in"
-	source "package/python-configshell-fb/Config.in"
-	source "package/python-crc16/Config.in"
-	source "package/python-daemon/Config.in"
-	source "package/python-dialog/Config.in"
-	source "package/python-django/Config.in"
-	source "package/python-docopt/Config.in"
-	source "package/python-dpkt/Config.in"
-	source "package/python-enum/Config.in"
-	source "package/python-enum34/Config.in"
-	source "package/python-flask/Config.in"
-	source "package/python-flup/Config.in"
-	source "package/python-gobject/Config.in"
-	source "package/python-html5lib/Config.in"
-	source "package/python-httplib2/Config.in"
-	source "package/python-id3/Config.in"
-	source "package/python-idna/Config.in"
-	source "package/python-ipaddr/Config.in"
-	source "package/python-ipaddress/Config.in"
-	source "package/python-ipy/Config.in"
-	source "package/python-ipython/Config.in"
-	source "package/python-itsdangerous/Config.in"
-	source "package/python-jinja2/Config.in"
-	source "package/python-json-schema-validator/Config.in"
-	source "package/python-keyring/Config.in"
-	source "package/python-libconfig/Config.in"
-	source "package/python-lxml/Config.in"
-	source "package/python-mad/Config.in"
-	source "package/python-mako/Config.in"
-	source "package/python-markdown/Config.in"
-	source "package/python-markupsafe/Config.in"
-	source "package/python-meld3/Config.in"
-	source "package/python-msgpack/Config.in"
-	source "package/python-netifaces/Config.in"
-	source "package/python-networkmanager/Config.in"
-	source "package/python-nfc/Config.in"
-	source "package/python-numpy/Config.in"
-	source "package/python-paho-mqtt/Config.in"
-	source "package/python-pam/Config.in"
-	source "package/python-posix-ipc/Config.in"
-	source "package/python-protobuf/Config.in"
-	source "package/python-psutil/Config.in"
-	source "package/python-pyasn/Config.in"
-	source "package/python-pycli/Config.in"
-	source "package/python-pycrypto/Config.in"
-	source "package/python-pydal/Config.in"
-	source "package/python-pyftpdlib/Config.in"
-	source "package/python-pygame/Config.in"
-	source "package/python-pyinotify/Config.in"
-	source "package/python-pyparsing/Config.in"
-	source "package/python-pypcap/Config.in"
-	source "package/python-pyqt/Config.in"
-	source "package/python-pyratemp/Config.in"
-	source "package/python-pyro/Config.in"
-	source "package/python-pyroute2/Config.in"
-	source "package/python-pysendfile/Config.in"
-	source "package/python-pysmb/Config.in"
-	source "package/python-pysnmp/Config.in"
-	source "package/python-pysnmp-apps/Config.in"
-	source "package/python-pysnmp-mibs/Config.in"
-	source "package/python-pyudev/Config.in"
-	source "package/python-pyusb/Config.in"
-	source "package/python-pyxb/Config.in"
-	source "package/python-pyyaml/Config.in"
-	source "package/python-pyzmq/Config.in"
-	source "package/python-requests/Config.in"
-	source "package/python-rtslib-fb/Config.in"
-	source "package/python-serial/Config.in"
-	source "package/python-setuptools/Config.in"
-	source "package/python-simplejson/Config.in"
-	source "package/python-singledispatch/Config.in"
-	source "package/python-sip/Config.in"
-	source "package/python-six/Config.in"
-	source "package/python-spidev/Config.in"
-	source "package/python-thrift/Config.in"
-	source "package/python-tornado/Config.in"
-	source "package/python-twisted/Config.in"
-	source "package/python-urllib3/Config.in"
-	source "package/python-urwid/Config.in"
-	source "package/python-versiontools/Config.in"
-	source "package/python-web2py/Config.in"
-	source "package/python-webpy/Config.in"
-	source "package/python-werkzeug/Config.in"
-	source "package/python-ws4py/Config.in"
-	source "package/python-zope-interface/Config.in"
-endmenu
-endif
 	source "package/ruby/Config.in"
 	source "package/tcl/Config.in"
 if BR2_PACKAGE_TCL
diff --git a/package/python/Config.ext b/package/python/Config.ext
new file mode 100644
index 0000000..154e653
--- /dev/null
+++ b/package/python/Config.ext
@@ -0,0 +1,98 @@
+# This file is included both from python and python3
+
+comment "External python modules"
+
+source "package/python-alsaaudio/Config.in"
+source "package/python-backports-abc/Config.in"
+source "package/python-bottle/Config.in"
+source "package/python-can/Config.in"
+source "package/python-certifi/Config.in"
+source "package/python-cffi/Config.in"
+source "package/python-cheetah/Config.in"
+source "package/python-cherrypy/Config.in"
+source "package/python-coherence/Config.in"
+source "package/python-configobj/Config.in"
+source "package/python-configshell-fb/Config.in"
+source "package/python-crc16/Config.in"
+source "package/python-daemon/Config.in"
+source "package/python-dialog/Config.in"
+source "package/python-django/Config.in"
+source "package/python-docopt/Config.in"
+source "package/python-dpkt/Config.in"
+source "package/python-enum/Config.in"
+source "package/python-enum34/Config.in"
+source "package/python-flask/Config.in"
+source "package/python-flup/Config.in"
+source "package/python-gobject/Config.in"
+source "package/python-html5lib/Config.in"
+source "package/python-httplib2/Config.in"
+source "package/python-id3/Config.in"
+source "package/python-idna/Config.in"
+source "package/python-ipaddr/Config.in"
+source "package/python-ipaddress/Config.in"
+source "package/python-ipy/Config.in"
+source "package/python-ipython/Config.in"
+source "package/python-itsdangerous/Config.in"
+source "package/python-jinja2/Config.in"
+source "package/python-json-schema-validator/Config.in"
+source "package/python-keyring/Config.in"
+source "package/python-libconfig/Config.in"
+source "package/python-lxml/Config.in"
+source "package/python-mad/Config.in"
+source "package/python-mako/Config.in"
+source "package/python-markdown/Config.in"
+source "package/python-markupsafe/Config.in"
+source "package/python-meld3/Config.in"
+source "package/python-msgpack/Config.in"
+source "package/python-netifaces/Config.in"
+source "package/python-networkmanager/Config.in"
+source "package/python-nfc/Config.in"
+source "package/python-numpy/Config.in"
+source "package/python-paho-mqtt/Config.in"
+source "package/python-pam/Config.in"
+source "package/python-posix-ipc/Config.in"
+source "package/python-protobuf/Config.in"
+source "package/python-psutil/Config.in"
+source "package/python-pyasn/Config.in"
+source "package/python-pycli/Config.in"
+source "package/python-pycrypto/Config.in"
+source "package/python-pydal/Config.in"
+source "package/python-pyftpdlib/Config.in"
+source "package/python-pygame/Config.in"
+source "package/python-pyinotify/Config.in"
+source "package/python-pyparsing/Config.in"
+source "package/python-pypcap/Config.in"
+source "package/python-pyqt/Config.in"
+source "package/python-pyratemp/Config.in"
+source "package/python-pyro/Config.in"
+source "package/python-pyroute2/Config.in"
+source "package/python-pysendfile/Config.in"
+source "package/python-pysmb/Config.in"
+source "package/python-pysnmp/Config.in"
+source "package/python-pysnmp-apps/Config.in"
+source "package/python-pysnmp-mibs/Config.in"
+source "package/python-pyudev/Config.in"
+source "package/python-pyusb/Config.in"
+source "package/python-pyxb/Config.in"
+source "package/python-pyyaml/Config.in"
+source "package/python-pyzmq/Config.in"
+source "package/python-requests/Config.in"
+source "package/python-rtslib-fb/Config.in"
+source "package/python-serial/Config.in"
+source "package/python-setuptools/Config.in"
+source "package/python-simplejson/Config.in"
+source "package/python-singledispatch/Config.in"
+source "package/python-sip/Config.in"
+source "package/python-six/Config.in"
+source "package/python-spidev/Config.in"
+source "package/python-thrift/Config.in"
+source "package/python-tornado/Config.in"
+source "package/python-twisted/Config.in"
+source "package/python-urllib3/Config.in"
+source "package/python-urwid/Config.in"
+source "package/python-versiontools/Config.in"
+source "package/python-web2py/Config.in"
+source "package/python-webpy/Config.in"
+source "package/python-werkzeug/Config.in"
+source "package/python-ws4py/Config.in"
+source "package/python-zope-interface/Config.in"
diff --git a/package/python/Config.in b/package/python/Config.in
index 40a2ef4..6563cd6 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -127,4 +127,6 @@ config BR2_PACKAGE_PYTHON_HASHLIB
 	help
 	  hashlib support in Python
 
+source "package/python/Config.ext"
+
 endif
diff --git a/package/python3/Config.ext b/package/python3/Config.ext
new file mode 120000
index 0000000..1b3df59
--- /dev/null
+++ b/package/python3/Config.ext
@@ -0,0 +1 @@
+../python/Config.ext
\ No newline at end of file
diff --git a/package/python3/Config.in b/package/python3/Config.in
index aadc8b6..f221a54 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -104,4 +104,6 @@ config BR2_PACKAGE_PYTHON3_ZLIB
 	help
 	  zlib support in Python3
 
+source "package/python3/Config.ext"
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 22/80 v1] package/sdl_image: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/sdl_image/Config.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/sdl_image/Config.in b/package/sdl_image/Config.in
index 1b98066..0c4a018 100644
--- a/package/sdl_image/Config.in
+++ b/package/sdl_image/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_SDL_IMAGE
+menuconfig BR2_PACKAGE_SDL_IMAGE
 	bool "SDL_image"
 	depends on BR2_PACKAGE_SDL
 	help
@@ -10,8 +10,6 @@ config BR2_PACKAGE_SDL_IMAGE
 
 if BR2_PACKAGE_SDL_IMAGE
 
-menu "SDL_image file format support"
-
 config BR2_PACKAGE_SDL_IMAGE_BMP
 	bool "enable BMP file format support"
 	default y
@@ -56,6 +54,4 @@ config BR2_PACKAGE_SDL_IMAGE_XPM
 config BR2_PACKAGE_SDL_IMAGE_XV
 	bool "enable XV file format support"
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 23/80 v1] package/tcl: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Move inclusion of Tcl libraries/modules to Tcl's Config.in so that they
appear in Tcl's sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in     | 6 ------
 package/tcl/Config.in | 7 ++++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 531b1a0..b7c5813 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -548,12 +548,6 @@ endif
 	source "package/python3/Config.in"
 	source "package/ruby/Config.in"
 	source "package/tcl/Config.in"
-if BR2_PACKAGE_TCL
-menu "Tcl libraries/modules"
-	source "package/expect/Config.in"
-	source "package/tcllib/Config.in"
-endmenu
-endif
 endmenu
 
 menu "Libraries"
diff --git a/package/tcl/Config.in b/package/tcl/Config.in
index f1fa054..dacd1a8 100644
--- a/package/tcl/Config.in
+++ b/package/tcl/Config.in
@@ -2,7 +2,7 @@ comment "tcl needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
-config BR2_PACKAGE_TCL
+menuconfig BR2_PACKAGE_TCL
 	bool "tcl"
 	# fork()
 	depends on BR2_USE_MMU
@@ -36,4 +36,9 @@ config BR2_PACKAGE_TCL_SHLIB_ONLY
 
 	  Saves ~14kb.
 
+comment "Tcl libraries/modules"
+
+source "package/expect/Config.in"
+source "package/tcllib/Config.in"
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 24/80 v1] package/tiff: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/tiff/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/tiff/Config.in b/package/tiff/Config.in
index acb335c..66d37fd 100644
--- a/package/tiff/Config.in
+++ b/package/tiff/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_TIFF
+menuconfig BR2_PACKAGE_TIFF
 	bool "tiff"
 	help
 	  Library for handling TIFF (Tag Image File Format) images.
@@ -6,7 +6,6 @@ config BR2_PACKAGE_TIFF
 	  http://www.libtiff.org/
 
 if BR2_PACKAGE_TIFF
-menu "tiff Options"
 
 config BR2_PACKAGE_TIFF_CCITT
 	bool "CCITT Group 3 & 4 support"
@@ -58,7 +57,6 @@ config BR2_PACKAGE_TIFF_OLD_JPEG
 config BR2_PACKAGE_TIFF_JBIG
 	bool "JBIG compression"
 	default y
-endmenu
 
 config BR2_PACKAGE_TIFF_UTILITIES
 	bool "tiff utilities"
-- 
1.9.1

[Buildroot] [PATCH 25/80 v1] package/udpcast: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

This is a bit overkill, as there is only two sub-items. However, this
commit is not about judging whether it makes sense or not to have a
sub-menu, but to cleanup the 'config'+'menu' situation.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/udpcast/Config.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
index 0424db7..a61829a 100644
--- a/package/udpcast/Config.in
+++ b/package/udpcast/Config.in
@@ -2,7 +2,7 @@ comment "udpcast needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_UDPCAST
+menuconfig BR2_PACKAGE_UDPCAST
 	bool "udpcast"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
@@ -14,8 +14,6 @@ config BR2_PACKAGE_UDPCAST
 
 if BR2_PACKAGE_UDPCAST
 
-menu "udpcast tools selection"
-
 config BR2_PACKAGE_UDPCAST_SENDER
 	bool "sender"
 	help
@@ -26,6 +24,4 @@ config BR2_PACKAGE_UDPCAST_RECEIVER
 	help
 	  The udpcast receiver.
 
-endmenu
-
 endif
-- 
1.9.1

[Buildroot] [PATCH 26/80 v1] package/gstreamer: include plugins from gstreamer's real Config.in

[Yann E. MORIN]

It is more logical to have a single if-clause, rather than repeat it in
another file, possiblty brealking indentation like it previously was.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/gstreamer/Config.in           | 12 ------------
 package/gstreamer/gstreamer/Config.in | 10 ++++++++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/package/gstreamer/Config.in b/package/gstreamer/Config.in
index c6292f4..476f838 100644
--- a/package/gstreamer/Config.in
+++ b/package/gstreamer/Config.in
@@ -1,14 +1,2 @@
 # Gstreamer 0.10.x & Plugins
 source "package/gstreamer/gstreamer/Config.in"
-
-if BR2_PACKAGE_GSTREAMER
-source "package/gstreamer/gst-plugins-base/Config.in"
-source "package/gstreamer/gst-plugins-good/Config.in"
-source "package/gstreamer/gst-plugins-bad/Config.in"
-source "package/gstreamer/gst-plugins-ugly/Config.in"
-source "package/gstreamer/gst-ffmpeg/Config.in"
-source "package/gstreamer/gst-dsp/Config.in"
-source "package/gstreamer/gst-fsl-plugins/Config.in"
-source "package/gstreamer/gst-omapfb/Config.in"
-source "package/gstreamer/gst-plugin-x170/Config.in"
-endif
diff --git a/package/gstreamer/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in
index eb1249a..aee48b1 100644
--- a/package/gstreamer/gstreamer/Config.in
+++ b/package/gstreamer/gstreamer/Config.in
@@ -33,4 +33,14 @@ config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY
 	  Enable support for the GStreamer plugin registry. This may increase
 	  the launch-time for a GStreamer application.
 
+source "package/gstreamer/gst-plugins-base/Config.in"
+source "package/gstreamer/gst-plugins-good/Config.in"
+source "package/gstreamer/gst-plugins-bad/Config.in"
+source "package/gstreamer/gst-plugins-ugly/Config.in"
+source "package/gstreamer/gst-ffmpeg/Config.in"
+source "package/gstreamer/gst-dsp/Config.in"
+source "package/gstreamer/gst-fsl-plugins/Config.in"
+source "package/gstreamer/gst-omapfb/Config.in"
+source "package/gstreamer/gst-plugin-x170/Config.in"
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 27/80 v1] package/gstreamer1: include plugins from gstreamer1's real Config.in

[Yann E. MORIN]

It is more logical to have a single if-clause, rather than repeat it in
another file, possiblty brealking indentation like it previously was.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/gstreamer1/Config.in            | 11 -----------
 package/gstreamer1/gstreamer1/Config.in |  9 +++++++++
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/package/gstreamer1/Config.in b/package/gstreamer1/Config.in
index ea35ecc..ca3240f 100644
--- a/package/gstreamer1/Config.in
+++ b/package/gstreamer1/Config.in
@@ -1,13 +1,2 @@
 # Gstreamer 1.x & Plugins
 source "package/gstreamer1/gstreamer1/Config.in"
-
-if BR2_PACKAGE_GSTREAMER1
-source "package/gstreamer1/gst1-plugins-base/Config.in"
-source "package/gstreamer1/gst1-plugins-good/Config.in"
-source "package/gstreamer1/gst1-plugins-bad/Config.in"
-source "package/gstreamer1/gst1-plugins-ugly/Config.in"
-source "package/gstreamer1/gst1-imx/Config.in"
-source "package/gstreamer1/gst1-libav/Config.in"
-source "package/gstreamer1/gst1-validate/Config.in"
-source "package/gstreamer1/gst-omx/Config.in"
-endif
diff --git a/package/gstreamer1/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in
index c13f041..fff8794 100644
--- a/package/gstreamer1/gstreamer1/Config.in
+++ b/package/gstreamer1/gstreamer1/Config.in
@@ -52,4 +52,13 @@ config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
 	  Install the gst-launch and gst-inspect tools. This will take up
 	  additional space on the target.
 
+source "package/gstreamer1/gst1-plugins-base/Config.in"
+source "package/gstreamer1/gst1-plugins-good/Config.in"
+source "package/gstreamer1/gst1-plugins-bad/Config.in"
+source "package/gstreamer1/gst1-plugins-ugly/Config.in"
+source "package/gstreamer1/gst1-imx/Config.in"
+source "package/gstreamer1/gst1-libav/Config.in"
+source "package/gstreamer1/gst1-validate/Config.in"
+source "package/gstreamer1/gst-omx/Config.in"
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 28/80 v1] docs/manual: slightly compactify a paragraph

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 docs/manual/adding-packages-directory.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index c2d9f75..d0de358 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -39,12 +39,11 @@ itself should be indented with one tab and two spaces, lines should
 not be longer than 72 columns, and it must mention the upstream URL
 of the project.
 
-You can add other sub-options into a +if
-BR2_PACKAGE_LIBFOO...endif+ statement to configure particular things
-in your software. You can look at examples in other packages. The
-syntax of the +Config.in+ file is the same as the one for the kernel
-Kconfig file. The documentation for this syntax is available at
-http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[]
+You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+
+statement to configure particular things in your software. You can look at
+examples in other packages. The syntax of the +Config.in+ file is the same
+as the one for the kernel Kconfig file. The documentation for this syntax is
+available at http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[]
 
 Finally you have to add your new +libfoo/Config.in+ to
 +package/Config.in+ (or in a category subdirectory if you decided to
-- 
1.9.1

[Buildroot] [PATCH 29/80 v1] docs/manual: add ordering of kconfig options' attributes

[Yann E. MORIN]

We want to ensure all packages follow the same coding style, so we add a
blurb about the order of kconfig options' attributes:

  - first, the type and the prompt
  - the default value if needed
  - then dependencies of the 'depends on' category
  - followed by dependencies of the 'select' form
  - with eventually the help text

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 docs/manual/adding-packages-directory.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index d0de358..b9596a2 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -39,6 +39,15 @@ itself should be indented with one tab and two spaces, lines should
 not be longer than 72 columns, and it must mention the upstream URL
 of the project.
 
+As a convention specific to Buildroot, the ordering of the attributes
+is as follows:
+
+1. The type of option: +bool+, +string+... with the prompt
+2. If needed, the +default+ value(s)
+3. Any dependency of the +depends on+ form
+4. Any dependency of the +select+ form
+5. The help keyword and help text.
+
 You can add other sub-options into a +if BR2_PACKAGE_LIBFOO...endif+
 statement to configure particular things in your software. You can look at
 examples in other packages. The syntax of the +Config.in+ file is the same
-- 
1.9.1

[Buildroot] [PATCH 30/80 v1] docs/manual: add example about sub-options

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - wrap example at 72-chars  (Arnout)
---
 docs/manual/adding-packages-directory.txt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index b9596a2..9df8d25 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -54,6 +54,31 @@ examples in other packages. The syntax of the +Config.in+ file is the same
 as the one for the kernel Kconfig file. The documentation for this syntax is
 available at http://kernel.org/doc/Documentation/kbuild/kconfig-language.txt[]
 
+For example:
+
+---------------------------
+config BR2_PACKAGE_LIBFOO
+	bool "libfoo"
+	help
+	  This is a comment that explains what libfoo is.
+
+	  http://foosoftware.org/libfoo/
+
+if BR2_PACKAGE_LIBFOO
+
+config BR2_PACKAGE_LIBFOO_BAR
+	bool "bar support"
+	help
+	  This is a comment that briefly explains what bar support is,
+	  if it's not obvious.
+
+endif # BR2_PACKAGE_LIBFOO
+---------------------------
+
+The sub-options will be cleanly indented below the main symbol when it
+is enabled, and will be properly hidden when the symbol is disabled.
+
+
 Finally you have to add your new +libfoo/Config.in+ to
 +package/Config.in+ (or in a category subdirectory if you decided to
 put your package in one of the existing categories). The files
-- 
1.9.1

[Buildroot] [PATCH 31/80 v1] docs/manual: use 'menuconfig' when there are more than 5 sub-options

[Yann E. MORIN]

When a package has a lot of sub-options, the layout in menuconfig (the
mconf UI) is quickly getting messy.

Using 'menuconfig' (the kconfig keyword) will automatically create a
sub-menu, which provides a cleaner layout.

Document that, with 5 or more options, a 'menuconfig' should be used
instead of a simple 'config'.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Note: 5 is arbitrary. We could tweak it to a bit more, but on small
terminals (the smallest supported is 80x24), there are only 10 lines
for the menu entries, so 5 looks like a good compromise. YMMV.

---
Changes RFC -> v1:
  - wrap example at 72-chars  (Arnout)
---
 docs/manual/adding-packages-directory.txt | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index 9df8d25..ec9dbf5 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -79,6 +79,34 @@ The sub-options will be cleanly indented below the main symbol when it
 is enabled, and will be properly hidden when the symbol is disabled.
 
 
+If your package has 5 or more options, then you should use +menuconfig+
+to define the main symbol; this will ensure that all the package's
+sub-options are automaticaly classified in a sub-menu:
+
+---------------------------
+menuconfig BR2_PACKAGE_LIBFOO
+	bool "libfoo"
+	help
+	  This is a comment that explains what libfoo is.
+
+	  http://foosoftware.org/libfoo/
+
+if BR2_PACKAGE_LIBFOO
+
+config BR2_PACKAGE_LIBFOO_BAR
+	bool "bar support"
+	help
+	  This is a comment that briefly explains what bar support is,
+	  if it's not obvious.
+
+endif # BR2_PACKAGE_LIBFOO
+---------------------------
+
+In any case, ensure that there is no +comment+ or other symbol in-between
+the main symbol (be it +config+ or +menuconfig+) and the +if+ clause,
+otherwise 'Kconfig' will not properly classify the sub-options.
+
+
 Finally you have to add your new +libfoo/Config.in+ to
 +package/Config.in+ (or in a category subdirectory if you decided to
 put your package in one of the existing categories). The files
-- 
1.9.1

[Buildroot] [PATCH 32/80 v1] package/boost: use 'menuconfig'

[Yann E. MORIN]

boost has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/boost/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/boost/Config.in b/package/boost/Config.in
index 03935e8..c000773 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_BOOST_ARCH_SUPPORTS
 	bool
 	default y if !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
 
-config BR2_PACKAGE_BOOST
+menuconfig BR2_PACKAGE_BOOST
 	bool "boost"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_BOOST_ARCH_SUPPORTS
-- 
1.9.1

[Buildroot] [PATCH 33/80 v1] package/cairo: use 'menuconfig'

[Yann E. MORIN]

cairo has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/cairo/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 38570d6..3525abc 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_CAIRO
+menuconfig BR2_PACKAGE_CAIRO
 	bool "cairo"
 	depends on BR2_ARCH_HAS_ATOMICS
 	select BR2_PACKAGE_PIXMAN
-- 
1.9.1

[Buildroot] [PATCH 34/80 v1] package/connman: use 'menuconfig'

[Yann E. MORIN]

connman has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/connman/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 655db86..2434385 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_CONNMAN
+menuconfig BR2_PACKAGE_CONNMAN
 	bool "connman"
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_LIBGLIB2
-- 
1.9.1

[Buildroot] [PATCH 35/80 v1] package/dejavu: use 'menuconfig'

[Yann E. MORIN]

dejavu has 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/dejavu/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dejavu/Config.in b/package/dejavu/Config.in
index 5d21e56..8e114f0 100644
--- a/package/dejavu/Config.in
+++ b/package/dejavu/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_DEJAVU
+menuconfig BR2_PACKAGE_DEJAVU
 	bool "DejaVu fonts"
 	help
 	  The DejaVu fonts are a font family based on the Vera Fonts.
-- 
1.9.1

[Buildroot] [PATCH 36/80 v1] package/directfb: use 'menuconfig'

[Yann E. MORIN]

directfb has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/directfb/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 73425d3..6a233dc 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_DIRECTFB
+menuconfig BR2_PACKAGE_DIRECTFB
 	bool "directfb"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
-- 
1.9.1

[Buildroot] [PATCH 37/80 v1] package/dnsmasq: use 'menuconfig'

[Yann E. MORIN]

dnsmasq has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/dnsmasq/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index b4f34b8..d78c0be 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_DNSMASQ
+menuconfig BR2_PACKAGE_DNSMASQ
 	bool "dnsmasq"
 	help
 	  A lightweight DNS and DHCP server. It is intended to provide
-- 
1.9.1

[Buildroot] [PATCH 38/80 v1] package/dovecot: use 'menuconfig'

[Yann E. MORIN]

dovecot has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/dovecot/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in
index 3baae6e..5b35286 100644
--- a/package/dovecot/Config.in
+++ b/package/dovecot/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_DOVECOT
+menuconfig BR2_PACKAGE_DOVECOT
 	bool "dovecot"
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_MMU # fork()
-- 
1.9.1

[Buildroot] [PATCH 39/80 v1] package/dropbear: use 'menuconfig'

[Yann E. MORIN]

dropbear has 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/dropbear/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index d92361f..ce1a73b 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_DROPBEAR
+menuconfig BR2_PACKAGE_DROPBEAR
 	bool "dropbear"
 	select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
 	help
-- 
1.9.1

[Buildroot] [PATCH 40/80 v1] package/e2fsprogs: use 'menuconfig'

[Yann E. MORIN]

e2fsprogs has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/e2fsprogs/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index ad33983..dd426b0 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -1,5 +1,4 @@
-
-config BR2_PACKAGE_E2FSPROGS
+menuconfig BR2_PACKAGE_E2FSPROGS
 	bool "e2fsprogs"
 	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_USE_MMU # util-linux/libblkid
-- 
1.9.1

[Buildroot] [PATCH 41/80 v1] package/efl: use 'menuconfig'

[Yann E. MORIN]

EFL has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/efl/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/efl/Config.in b/package/efl/Config.in
index fd3498e..f93c1c1 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_EFL
+menuconfig BR2_PACKAGE_EFL
 	bool "efl"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_HAS_UDEV # libudev
-- 
1.9.1

[Buildroot] [PATCH 42/80 v1] package/erlang: include Erlang libraries from erlang's Config.in

[Yann E. MORIN]

erlang now has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in        | 16 ----------------
 package/erlang/Config.in | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index b7c5813..4fe5c81 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -466,22 +466,6 @@ endmenu
 menu "Interpreter languages and scripting"
 	source "package/enscript/Config.in"
 	source "package/erlang/Config.in"
-if BR2_PACKAGE_ERLANG
-menu "Erlang libraries/modules"
-	source "package/erlang-goldrush/Config.in"
-	source "package/erlang-lager/Config.in"
-	source "package/erlang-p1-cache-tab/Config.in"
-	source "package/erlang-p1-iconv/Config.in"
-	source "package/erlang-p1-sip/Config.in"
-	source "package/erlang-p1-stringprep/Config.in"
-	source "package/erlang-p1-stun/Config.in"
-	source "package/erlang-p1-tls/Config.in"
-	source "package/erlang-p1-utils/Config.in"
-	source "package/erlang-p1-xml/Config.in"
-	source "package/erlang-p1-yaml/Config.in"
-	source "package/erlang-p1-zlib/Config.in"
-endmenu
-endif
 	source "package/gauche/Config.in"
 	source "package/guile/Config.in"
 	source "package/haserl/Config.in"
diff --git a/package/erlang/Config.in b/package/erlang/Config.in
index 0ec01bb..f6da256 100644
--- a/package/erlang/Config.in
+++ b/package/erlang/Config.in
@@ -3,7 +3,7 @@ comment "erlang needs a toolchain w/ dynamic library"
 	depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_ERLANG
+menuconfig BR2_PACKAGE_ERLANG
 	bool "erlang"
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
@@ -37,4 +37,19 @@ config BR2_PACKAGE_ERLANG_MEGACO
 	  size so if you do not need it then it is recommended not to
 	  enable it.
 
+comment "Erlang libraries/modules"
+
+source "package/erlang-goldrush/Config.in"
+source "package/erlang-lager/Config.in"
+source "package/erlang-p1-cache-tab/Config.in"
+source "package/erlang-p1-iconv/Config.in"
+source "package/erlang-p1-sip/Config.in"
+source "package/erlang-p1-stringprep/Config.in"
+source "package/erlang-p1-stun/Config.in"
+source "package/erlang-p1-tls/Config.in"
+source "package/erlang-p1-utils/Config.in"
+source "package/erlang-p1-xml/Config.in"
+source "package/erlang-p1-yaml/Config.in"
+source "package/erlang-p1-zlib/Config.in"
+
 endif # BR2_PACKAGE_ERLANG
-- 
1.9.1

[Buildroot] [PATCH 43/80 v1] package/flot: use 'menuconfig'

[Yann E. MORIN]

flot has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/flot/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/flot/Config.in b/package/flot/Config.in
index 4c0d3ec..0037ff2 100644
--- a/package/flot/Config.in
+++ b/package/flot/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_FLOT
+menuconfig BR2_PACKAGE_FLOT
 	bool "flot"
 	select BR2_PACKAGE_JQUERY
 	help
@@ -18,8 +18,6 @@ config BR2_PACKAGE_FLOT
 
 if BR2_PACKAGE_FLOT
 
-comment "flot plugins"
-
 config BR2_PACKAGE_FLOT_CANVAS
 	bool "canvas"
 	help
-- 
1.9.1

[Buildroot] [PATCH 44/80 v1] package/gnuradio: use 'menuconfig'

[Yann E. MORIN]

gnuradio has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/gnuradio/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index 603532c..f2c884b 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -4,7 +4,7 @@ comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 
-config BR2_PACKAGE_GNURADIO
+menuconfig BR2_PACKAGE_GNURADIO
 	bool "gnuradio"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS
-- 
1.9.1

[Buildroot] [PATCH 45/80 v1] package/gnuradio: split long omment

[Yann E. MORIN]

It does not fit even is a wider-than-normal terminal.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1;
  - tabulate comment  (Arnout)
  - slightly tweak sentence  (Arnout)
  - follow alphabetical ordering

---
Note to Arnout: I did not exactly use your proposal to fix the sentence,
because it was too wide or would have required yet another line.
---
 package/gnuradio/Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index f2c884b..3dfd0a3 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -58,8 +58,11 @@ config BR2_PACKAGE_GNURADIO_UTILS
 	help
 	  Misc python utilities
 
-comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager depends fftw's single precision"
-	depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE
+if !BR2_PACKAGE_FFTW_PRECISION_SINGLE
+comment "gr-analog, gr-channels, gr-digital, gr-fft,"
+comment "gr-filter, gr-pager and gr-trellis support "
+comment "all depend on fftw with single precision.  "
+endif
 
 if BR2_PACKAGE_FFTW_PRECISION_SINGLE
 
-- 
1.9.1

[Buildroot] [PATCH 46/80 v1] package/google-material-design-icons: use 'menuconfig'

[Yann E. MORIN]

google-material-design-icons has more than 5 options, so use a
'menuconfig' to group the options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/google-material-design-icons/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/google-material-design-icons/Config.in b/package/google-material-design-icons/Config.in
index a200429..d7be363 100644
--- a/package/google-material-design-icons/Config.in
+++ b/package/google-material-design-icons/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS
+menuconfig BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS
 	bool "google-material-design-icons"
 	help
 	  Material design icons are the official icon set from Google that
-- 
1.9.1

[Buildroot] [PATCH 47/80 v1] package/gstreamer: use 'menuconfig'

[Yann E. MORIN]

gstreamer has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - fix commit log+title  (Arnout)
  - move later in the series, after we document that 5-or-more
    sub-options require a menuconfig
---
 package/gstreamer/gstreamer/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer/gstreamer/Config.in b/package/gstreamer/gstreamer/Config.in
index aee48b1..cba8774 100644
--- a/package/gstreamer/gstreamer/Config.in
+++ b/package/gstreamer/gstreamer/Config.in
@@ -2,7 +2,7 @@ comment "gstreamer 0.10 needs a toolchain w/ wchar, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_GSTREAMER
+menuconfig BR2_PACKAGE_GSTREAMER
 	bool "gstreamer 0.10"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-- 
1.9.1

[Buildroot] [PATCH 48/80 v1] package/gstreamer1: use 'menuconfig'

[Yann E. MORIN]

gstreamer1 has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Changes RFC -> v1:
  - fix commit log+title  (Arnout)
  - move later in the series, after we document that 5-or-more
    sub-options require a menuconfig
---
 package/gstreamer1/gstreamer1/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/gstreamer1/gstreamer1/Config.in b/package/gstreamer1/gstreamer1/Config.in
index fff8794..a391324 100644
--- a/package/gstreamer1/gstreamer1/Config.in
+++ b/package/gstreamer1/gstreamer1/Config.in
@@ -2,7 +2,7 @@ comment "gstreamer 1.x needs a toolchain w/ wchar, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
-config BR2_PACKAGE_GSTREAMER1
+menuconfig BR2_PACKAGE_GSTREAMER1
 	bool "gstreamer 1.x"
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-- 
1.9.1

[Buildroot] [PATCH 49/80 v1] package/igh-ethercat: use 'menuconfig'

[Yann E. MORIN]

igh-ethercat has 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/igh-ethercat/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/igh-ethercat/Config.in b/package/igh-ethercat/Config.in
index e600ef5..696e550 100644
--- a/package/igh-ethercat/Config.in
+++ b/package/igh-ethercat/Config.in
@@ -1,7 +1,7 @@
 comment "igh-ethercat needs a Linux kernel to be built"
 	depends on !BR2_LINUX_KERNEL
 
-config BR2_PACKAGE_IGH_ETHERCAT
+menuconfig BR2_PACKAGE_IGH_ETHERCAT
 	bool "igh-ethercat"
 	depends on BR2_LINUX_KERNEL
 	help
-- 
1.9.1

[Buildroot] [PATCH 50/80 v1] package/imlib2: use 'menuconfig'

[Yann E. MORIN]

imlib2 has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/imlib2/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/imlib2/Config.in b/package/imlib2/Config.in
index 7aac074..0b10623 100644
--- a/package/imlib2/Config.in
+++ b/package/imlib2/Config.in
@@ -1,7 +1,7 @@
 comment "imlib2 needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_IMLIB2
+menuconfig BR2_PACKAGE_IMLIB2
 	bool "imlib2"
 	select BR2_PACKAGE_FREETYPE
 	depends on !BR2_STATIC_LIBS # dlopen()
@@ -39,4 +39,5 @@ config BR2_PACKAGE_IMLIB2_X
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBX11
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 51/80 v1] package/ipsec-tools: use 'menuconfig'

[Yann E. MORIN]

ipsec-tools has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/ipsec-tools/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 4af4095..7309e8d 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_IPSEC_TOOLS
+menuconfig BR2_PACKAGE_IPSEC_TOOLS
 	bool "ipsec-tools"
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_FLEX
-- 
1.9.1

[Buildroot] [PATCH 52/80 v1] package/lftp: use 'menuconfig'

[Yann E. MORIN]

lftp has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/lftp/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lftp/Config.in b/package/lftp/Config.in
index fb4ac13..b83a256 100644
--- a/package/lftp/Config.in
+++ b/package/lftp/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LFTP
+menuconfig BR2_PACKAGE_LFTP
 	bool "lftp"
 	depends on BR2_USE_WCHAR
 	depends on BR2_INSTALL_LIBSTDCPP
-- 
1.9.1

[Buildroot] [PATCH 53/80 v1] package/libiio: use 'menuconfig'

[Yann E. MORIN]

libiio has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/libiio/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libiio/Config.in b/package/libiio/Config.in
index 99da4c1..7112fc5 100644
--- a/package/libiio/Config.in
+++ b/package/libiio/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LIBIIO
+menuconfig BR2_PACKAGE_LIBIIO
 	bool "libiio"
 	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND if !BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
 	help
-- 
1.9.1

[Buildroot] [PATCH 54/80 v1] package/lighttpd: use 'menuconfig'

[Yann E. MORIN]

lighttpd has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/lighttpd/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index f62ccb9..6672ec1 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -2,7 +2,7 @@ comment "lighttpd needs a toolchain w/ dynamic library"
 	depends on BR2_USE_MMU
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_LIGHTTPD
+menuconfig BR2_PACKAGE_LIGHTTPD
 	bool "lighttpd"
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
-- 
1.9.1

[Buildroot] [PATCH 55/80 v1] package/linux-firmware: use 'menuconfig'

[Yann E. MORIN]

linux-firmware has more than 5 options, so use a 'menuconfig' to group
the options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/linux-firmware/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index d838986..80e2bb0 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LINUX_FIRMWARE
+menuconfig BR2_PACKAGE_LINUX_FIRMWARE
 	bool "linux-firmware"
 	help
 	  This package provides various binary firmware files (closed
-- 
1.9.1

[Buildroot] [PATCH 56/80 v1] package/lm-sensors: use 'menuconfig'

[Yann E. MORIN]

lm-sensors has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/lm-sensors/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/lm-sensors/Config.in b/package/lm-sensors/Config.in
index 7065c4c..e6dd085 100644
--- a/package/lm-sensors/Config.in
+++ b/package/lm-sensors/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LM_SENSORS
+menuconfig BR2_PACKAGE_LM_SENSORS
 	bool "lm-sensors"
 	help
 	  Lm-sensors is a hardware health monitoring package for
@@ -9,7 +9,6 @@ config BR2_PACKAGE_LM_SENSORS
 	  http://www.lm-sensors.org/
 
 if BR2_PACKAGE_LM_SENSORS
-comment "lm-sensors tools"
 
 config BR2_PACKAGE_LM_SENSORS_SENSORS
 	bool "sensors"
-- 
1.9.1

[Buildroot] [PATCH 57/80 v1] package/lua{, jit}: move inclusion of external libraries/modules

[Yann E. MORIN]

Introduce a Config.ext for external Lua external libraries/modules, that
both lua and luajit include from their respective sub-menus.

lua and luajit now have more than 5 options, so use a 'menuconfig' to
group the options in sub-menus.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in         | 46 --------------------------------------------
 package/lua/Config.ext    | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 package/lua/Config.in     |  4 +++-
 package/luajit/Config.ext |  1 +
 package/luajit/Config.in  |  4 +++-
 5 files changed, 56 insertions(+), 48 deletions(-)
 create mode 100644 package/lua/Config.ext
 create mode 120000 package/luajit/Config.ext

diff --git a/package/Config.in b/package/Config.in
index 4fe5c81..73f69ef 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -474,52 +474,6 @@ menu "Interpreter languages and scripting"
 	source "package/lua/Config.in"
 	source "package/luainterpreter/Config.in"
 	source "package/luajit/Config.in"
-if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS
-# lua modules are dynamically loaded, so not available on static builds
-menu "Lua libraries/modules"
-	source "package/cgilua/Config.in"
-	source "package/copas/Config.in"
-	source "package/cosmo/Config.in"
-	source "package/coxpcall/Config.in"
-	source "package/dado/Config.in"
-	source "package/lbase64/Config.in"
-	source "package/ljlinenoise/Config.in"
-	source "package/ljsyscall/Config.in"
-	source "package/lpeg/Config.in"
-	source "package/lpty/Config.in"
-	source "package/lrandom/Config.in"
-	source "package/lsqlite3/Config.in"
-	source "package/lua-cjson/Config.in"
-	source "package/lua-coat/Config.in"
-	source "package/lua-coatpersistent/Config.in"
-	source "package/lua-csnappy/Config.in"
-	source "package/lua-ev/Config.in"
-	source "package/lua-iconv/Config.in"
-	source "package/lua-messagepack/Config.in"
-	source "package/lua-msgpack-native/Config.in"
-	source "package/lua-periphery/Config.in"
-	source "package/lua-testmore/Config.in"
-	source "package/luabitop/Config.in"
-	source "package/luacrypto/Config.in"
-	source "package/luaexpat/Config.in"
-	source "package/luaexpatutils/Config.in"
-	source "package/luafilesystem/Config.in"
-	source "package/luajson/Config.in"
-	source "package/lualogging/Config.in"
-	source "package/luaposix/Config.in"
-	source "package/luasec/Config.in"
-	source "package/luasocket/Config.in"
-	source "package/luasql-sqlite3/Config.in"
-	source "package/lunit/Config.in"
-	source "package/luv/Config.in"
-	source "package/luvi/Config.in"
-	source "package/lzlib/Config.in"
-	source "package/orbit/Config.in"
-	source "package/rings/Config.in"
-	source "package/wsapi/Config.in"
-	source "package/xavante/Config.in"
-endmenu
-endif
 	source "package/lutok/Config.in"
 	source "package/micropython/Config.in"
 	source "package/micropython-lib/Config.in"
diff --git a/package/lua/Config.ext b/package/lua/Config.ext
new file mode 100644
index 0000000..4215e41
--- /dev/null
+++ b/package/lua/Config.ext
@@ -0,0 +1,49 @@
+# This file is included both from lua and luajit
+
+if !BR2_STATIC_LIBS
+
+comment "Lua libraries/modules"
+
+source "package/cgilua/Config.in"
+source "package/copas/Config.in"
+source "package/cosmo/Config.in"
+source "package/coxpcall/Config.in"
+source "package/dado/Config.in"
+source "package/lbase64/Config.in"
+source "package/ljlinenoise/Config.in"
+source "package/ljsyscall/Config.in"
+source "package/lpeg/Config.in"
+source "package/lpty/Config.in"
+source "package/lrandom/Config.in"
+source "package/lsqlite3/Config.in"
+source "package/lua-cjson/Config.in"
+source "package/lua-coat/Config.in"
+source "package/lua-coatpersistent/Config.in"
+source "package/lua-csnappy/Config.in"
+source "package/lua-ev/Config.in"
+source "package/lua-iconv/Config.in"
+source "package/lua-messagepack/Config.in"
+source "package/lua-msgpack-native/Config.in"
+source "package/lua-periphery/Config.in"
+source "package/lua-testmore/Config.in"
+source "package/luabitop/Config.in"
+source "package/luacrypto/Config.in"
+source "package/luaexpat/Config.in"
+source "package/luaexpatutils/Config.in"
+source "package/luafilesystem/Config.in"
+source "package/luajson/Config.in"
+source "package/lualogging/Config.in"
+source "package/luaposix/Config.in"
+source "package/luasec/Config.in"
+source "package/luasocket/Config.in"
+source "package/luasql-sqlite3/Config.in"
+source "package/lunit/Config.in"
+source "package/luv/Config.in"
+source "package/luvi/Config.in"
+source "package/lzlib/Config.in"
+source "package/orbit/Config.in"
+source "package/rings/Config.in"
+source "package/wsapi/Config.in"
+source "package/xavante/Config.in"
+
+endif # !static
diff --git a/package/lua/Config.in b/package/lua/Config.in
index 711fa89..99637dc 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_LUA
+menuconfig BR2_PACKAGE_LUA
 	bool "lua"
 	select BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
@@ -68,4 +68,6 @@ config BR2_PACKAGE_LUA_LINENOISE
 
 endchoice
 
+source "package/lua/Config.ext"
+
 endif
diff --git a/package/luajit/Config.ext b/package/luajit/Config.ext
new file mode 120000
index 0000000..62d6109
--- /dev/null
+++ b/package/luajit/Config.ext
@@ -0,0 +1 @@
+../lua/Config.ext
\ No newline at end of file
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index 8ce528b..4916b21 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 		BR2_powerpc || BR2_arm || BR2_armeb || \
 		((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT)
 
-config BR2_PACKAGE_LUAJIT
+menuconfig BR2_PACKAGE_LUAJIT
 	bool "luajit"
 	select BR2_PACKAGE_HAS_LUAINTERPRETER
 	depends on !BR2_STATIC_LIBS # dlopen
@@ -32,6 +32,8 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER
 config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
 	default "5.1"
 
+source "package/luajit/Config.ext"
+
 endif
 
 comment "luajit needs a toolchain w/ dynamic library"
-- 
1.9.1

[Buildroot] [PATCH 58/80 v1] package/mtd: use 'menuconfig'

[Yann E. MORIN]

mtd has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/mtd/Config.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index 6e4346f..5add9c1 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_MTD
+menuconfig BR2_PACKAGE_MTD
 	bool "mtd, jffs2 and ubi/ubifs tools"
 	help
 	  Build mtd, jffs2 and ubi/ubifs tools
@@ -6,7 +6,6 @@ config BR2_PACKAGE_MTD
 	  http://www.linux-mtd.infradead.org/
 
 if BR2_PACKAGE_MTD
-comment "MTD tools selection"
 
 config BR2_PACKAGE_MTD_DOCFDISK
 	bool "docfdisk"
-- 
1.9.1

[Buildroot] [PATCH 59/80 v1] package/ncurses: use 'menuconfig'

[Yann E. MORIN]

ncurses has 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/ncurses/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in
index 44713f9..0887b33 100644
--- a/package/ncurses/Config.in
+++ b/package/ncurses/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_NCURSES
+menuconfig BR2_PACKAGE_NCURSES
 	bool "ncurses"
 	help
 	  The Ncurses (new curses) library is a free software emulation of
-- 
1.9.1

[Buildroot] [PATCH 60/80 v1] package/ndisc6: use 'menuconfig'

[Yann E. MORIN]

ndisc6 has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/ndisc6/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
index 321bfbc..966ec91 100644
--- a/package/ndisc6/Config.in
+++ b/package/ndisc6/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_NDISC6
+menuconfig BR2_PACKAGE_NDISC6
 	bool "ndisc6 tools"
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-- 
1.9.1

[Buildroot] [PATCH 61/80 v1] package/netsnmp: use 'menuconfig'

[Yann E. MORIN]

netsnmp has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/netsnmp/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/netsnmp/Config.in b/package/netsnmp/Config.in
index 57cc6b9..3cef6f3 100644
--- a/package/netsnmp/Config.in
+++ b/package/netsnmp/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_NETSNMP
+menuconfig BR2_PACKAGE_NETSNMP
 	bool "netsnmp"
 	depends on BR2_USE_MMU # fork()
 	help
-- 
1.9.1

[Buildroot] [PATCH 62/80 v1] package/ntp: use 'menuconfig'

[Yann E. MORIN]

ntp has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/ntp/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index 1763225..2b8ecc9 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_NTP
+menuconfig BR2_PACKAGE_NTP
 	bool "ntp"
 	select BR2_PACKAGE_LIBEVENT
 	help
-- 
1.9.1

[Buildroot] [PATCH 63/80 v1] package/openobex: use 'menuconfig'

[Yann E. MORIN]

openobex has 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/openobex/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/openobex/Config.in b/package/openobex/Config.in
index 5f606fe..d2fd95f 100644
--- a/package/openobex/Config.in
+++ b/package/openobex/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_OPENOBEX
+menuconfig BR2_PACKAGE_OPENOBEX
 	bool "openobex"
 	help
 	  Free open source implementation of the Object Exchange (OBEX)
-- 
1.9.1

[Buildroot] [PATCH 64/80 v1] package/openocd: use 'menuconfig'

[Yann E. MORIN]

openocd has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/openocd/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/openocd/Config.in b/package/openocd/Config.in
index a35bd27..82b0c3b 100644
--- a/package/openocd/Config.in
+++ b/package/openocd/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_OPENOCD
+menuconfig BR2_PACKAGE_OPENOCD
 	bool "openocd"
 	help
 	  OpenOCD - Open On-Chip Debugger
@@ -7,8 +7,6 @@ config BR2_PACKAGE_OPENOCD
 
 if BR2_PACKAGE_OPENOCD
 
-comment "Adapters"
-
 config BR2_PACKAGE_OPENOCD_FTDI
 	bool "MPSSE mode of FTDI based devices"
 	select BR2_PACKAGE_LIBUSB
-- 
1.9.1

[Buildroot] [PATCH 65/80 v1] package/poco: use 'menuconfig'

[Yann E. MORIN]

poco has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/poco/Config.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/poco/Config.in b/package/poco/Config.in
index dfdc8d1..1e7ca21 100644
--- a/package/poco/Config.in
+++ b/package/poco/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_POCO
+menuconfig BR2_PACKAGE_POCO
 	bool "poco"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
@@ -15,8 +15,6 @@ config BR2_PACKAGE_POCO
 
 if BR2_PACKAGE_POCO
 
-comment "poco components"
-
 config BR2_PACKAGE_POCO_XML
 	bool "xml"
 	select BR2_PACKAGE_EXPAT
-- 
1.9.1

[Buildroot] [PATCH 66/80 v1] package/quagga: use 'menuconfig'

[Yann E. MORIN]

quagga has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/quagga/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 89ff6f2..9a23947 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_QUAGGA
+menuconfig BR2_PACKAGE_QUAGGA
 	bool "quagga"
 	depends on BR2_USE_MMU # fork()
 	help
-- 
1.9.1

[Buildroot] [PATCH 67/80 v1] package/sdl: use 'menuconfig'

[Yann E. MORIN]

SDL has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/sdl/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sdl/Config.in b/package/sdl/Config.in
index 65ac8a2..e0a4437 100644
--- a/package/sdl/Config.in
+++ b/package/sdl/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_SDL
+menuconfig BR2_PACKAGE_SDL
 	bool "SDL"
 	help
 	  Simple DirectMedia Layer - SDL is a library that allows
-- 
1.9.1

[Buildroot] [PATCH 68/80 v1] package/sdl: include SDL external libraries from sdl's Config.in

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/Config.in     | 6 ------
 package/sdl/Config.in | 9 +++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 73f69ef..ccf6d3c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -264,12 +264,6 @@ endif
 	source "package/ocrad/Config.in"
 	source "package/psplash/Config.in"
 	source "package/sdl/Config.in"
-	source "package/sdl_gfx/Config.in"
-	source "package/sdl_image/Config.in"
-	source "package/sdl_mixer/Config.in"
-	source "package/sdl_net/Config.in"
-	source "package/sdl_sound/Config.in"
-	source "package/sdl_ttf/Config.in"
 	source "package/sdl2/Config.in"
 
 comment "Other GUIs"
diff --git a/package/sdl/Config.in b/package/sdl/Config.in
index e0a4437..bba089c 100644
--- a/package/sdl/Config.in
+++ b/package/sdl/Config.in
@@ -27,4 +27,13 @@ config BR2_PACKAGE_SDL_X11
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXEXT
 
+comment "External libraries"
+
+source "package/sdl_gfx/Config.in"
+source "package/sdl_image/Config.in"
+source "package/sdl_mixer/Config.in"
+source "package/sdl_net/Config.in"
+source "package/sdl_sound/Config.in"
+source "package/sdl_ttf/Config.in"
+
 endif
-- 
1.9.1

[Buildroot] [PATCH 69/80 v1] package/sdl_*: remove redundant dependency

[Yann E. MORIN]

Now that those packages are directly included in an if-SDL clause, there
is no need to expressly depend on SDL.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/sdl_gfx/Config.in   | 1 -
 package/sdl_image/Config.in | 1 -
 package/sdl_mixer/Config.in | 1 -
 package/sdl_net/Config.in   | 1 -
 package/sdl_sound/Config.in | 1 -
 package/sdl_ttf/Config.in   | 1 -
 6 files changed, 6 deletions(-)

diff --git a/package/sdl_gfx/Config.in b/package/sdl_gfx/Config.in
index b5d5cac..0f4518b 100644
--- a/package/sdl_gfx/Config.in
+++ b/package/sdl_gfx/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SDL_GFX
 	bool "SDL_gfx"
-	depends on BR2_PACKAGE_SDL
 	help
 	  The SDL_gfx library is an extension to the SDL library which
 	  provides basic antialiased drawing routines such as lines,
diff --git a/package/sdl_image/Config.in b/package/sdl_image/Config.in
index 0c4a018..d9278d7 100644
--- a/package/sdl_image/Config.in
+++ b/package/sdl_image/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_SDL_IMAGE
 	bool "SDL_image"
-	depends on BR2_PACKAGE_SDL
 	help
 	  SDL_image is an image file loading library. It loads images
 	  as SDL surfaces, and supports the following formats:
diff --git a/package/sdl_mixer/Config.in b/package/sdl_mixer/Config.in
index 42dfe63..8d558ed 100644
--- a/package/sdl_mixer/Config.in
+++ b/package/sdl_mixer/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SDL_MIXER
 	bool "SDL_mixer"
-	depends on BR2_PACKAGE_SDL
 	help
 	  SDL_mixer is a sample multi-channel audio mixer library.
 	  It supports any number of simultaneously playing channels of
diff --git a/package/sdl_net/Config.in b/package/sdl_net/Config.in
index 2001d23..6fddba5 100644
--- a/package/sdl_net/Config.in
+++ b/package/sdl_net/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SDL_NET
 	bool "SDL_net"
-	depends on BR2_PACKAGE_SDL
 	help
 	  SDL_net is a small, low-level, cross-platform network library, that
 	  can be used with the Simple DirectMedia Layer library (SDL).
diff --git a/package/sdl_sound/Config.in b/package/sdl_sound/Config.in
index 6da1985..723f9ac 100644
--- a/package/sdl_sound/Config.in
+++ b/package/sdl_sound/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SDL_SOUND
 	bool "SDL_sound"
-	depends on BR2_PACKAGE_SDL
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  SDL_sound is a library that handles the decoding of several
diff --git a/package/sdl_ttf/Config.in b/package/sdl_ttf/Config.in
index efc92e5..be56139 100644
--- a/package/sdl_ttf/Config.in
+++ b/package/sdl_ttf/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SDL_TTF
 	bool "SDL_TTF"
-	depends on BR2_PACKAGE_SDL
 	select BR2_PACKAGE_FREETYPE
 	help
 	  SDL_ttf is a sample TrueType font library. It allows you to
-- 
1.9.1

[Buildroot] [PATCH 70/80 v1] package/squashfs: use 'menuconfig'

[Yann E. MORIN]

squashfs has 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/squashfs/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 70c0fc9..cec57f9 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_SQUASHFS
+menuconfig BR2_PACKAGE_SQUASHFS
 	bool "squashfs"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
-- 
1.9.1

[Buildroot] [PATCH 71/80 v1] package/sqlite: use 'menuconfig'

[Yann E. MORIN]

sqlite has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/sqlite/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in
index 7ea9eb1..605495f 100644
--- a/package/sqlite/Config.in
+++ b/package/sqlite/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_SQLITE
+menuconfig BR2_PACKAGE_SQLITE
 	bool "sqlite"
 	help
 	  SQLite is a small C library that implements a self-contained,
-- 
1.9.1

[Buildroot] [PATCH 72/80 v1] package/transmission: use 'menuconfig'

[Yann E. MORIN]

transmission has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/transmission/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index b47c36f..92928c7 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_TRANSMISSION
+menuconfig BR2_PACKAGE_TRANSMISSION
 	bool "transmission"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
@@ -45,6 +45,7 @@ config BR2_PACKAGE_TRANSMISSION_GTK
 
 comment "transmission-gtk needs a toolchain w/ locale"
 	depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE
+
 endif
 
 comment "transmission needs a toolchain w/ threads"
-- 
1.9.1

[Buildroot] [PATCH 73/80 v1] package/valgrind: use 'menuconfig'

[Yann E. MORIN]

Valgrind has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/valgrind/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in
index 21b2608..ce5c3b4 100644
--- a/package/valgrind/Config.in
+++ b/package/valgrind/Config.in
@@ -1,7 +1,7 @@
 comment "valgrind needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_VALGRIND
+menuconfig BR2_PACKAGE_VALGRIND
 	bool "valgrind"
 	depends on BR2_ARM_CPU_ARMV7A || BR2_i386 || \
 		   BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
-- 
1.9.1

[Buildroot] [PATCH 74/80 v1] package/wpa-supplicant: use 'menuconfig'

[Yann E. MORIN]

wpa-supplicant has more than 5 options, so use a 'menuconfig' to group the
options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/wpa_supplicant/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index f4c4167..26009c6 100644
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_WPA_SUPPLICANT
+menuconfig BR2_PACKAGE_WPA_SUPPLICANT
 	bool "wpa_supplicant"
 	depends on BR2_USE_MMU # fork()
 	help
-- 
1.9.1

[Buildroot] [PATCH 0/80 v1] pakages: use menuconfig to group sub-options (branch yem/menuconfig)

[Yann E. MORIN]

Hello All!

This series cleans up the layout of the menuconfig UI. Although it looks
to be pretty long (80 patches), it really only boils down to mainly three
different changes :

  - patches 1-27: changes use of 'config'+'menu' into a 'menuconfig'
    (the Kconfig keywords) to automatically arrange the sub-options into
    sub-menus;

  - patches 28-31: document that packages with 5 or more options should
    use sub-menus (with 'menuconfig') to store their sub-options;

  - patches 32-79: change a lot of packages according to the new rule.

A few interspersed, minor changes also provide further cleanups.


Using 'menuconfig' (like bar, below) instead of 'config'+'menu' (like
foo, below) provides a nicer layout (but that's just my taste!):

    [*] foo
        foo sub-menu --->
    [*] bar --->


Finally, moving 5-or-more sub-options to sub-menus also provides for a
nicer layout. Of course, I choose 5 arbitrarily; we can refine this
value, but 5 looked obvious to me.

This series however does not undo the 'menuconfig' of packages with less
than 5 sub-options, when such 'menuconfig' (or 'config'+'menu') were
already present before the series. This is left for another series later
on (this one is already big enough).


Last note: I did try to hunt for all packages, but it is not possible
to either:
  - review all Config.in, or
  - see all packages in the menuconfig UI (because of arch dependencies
    for example)

So, I may have missed a few... These can be fixed later.


Many thanks to Arnout for reviewing the series twice! :-)


Changes RFC -> v1:
  - don't turn some 'menu' into 'comment' when useless  (Arnout)
  - treat the 'angular' module separately  (Arnout)
  - follow our wrapping rules in the manual  (Arnout)
  - re-format the multi-line gnuradio comment  (Arnout)
  - tyopes  (Arnout)
  - re-order the gstreamer{,1} use of menuconfig after it is documented
  - use menuconfig for linux-firmware as well
  - re-order the post-manual patches alphabetically
  - the Kconfig syntax fixup in at91bootstrap


Regards,
Yann E. MORIN.


The following changes since commit 640b75c8d73d713c908d6b288802c9e6bffe76ed:

  package/boost: add patch to fix undeclared isnan issue (2016-01-16 18:18:31 +0100)

are available in the git repository at:

  git://git.busybox.net/~ymorin/git/buildroot yem/menuconfig

for you to fetch changes up to 9cc34f973a4ae3d610dfa15de50d23df7f1cc365:

  boot/at91bootstrap: choices must have a type (2016-01-16 23:16:37 +0100)

----------------------------------------------------------------
Yann E. MORIN (80):
      package/alsa-lib: use 'menuconfig' instead of 'config'+'menu'
      package/alsa-utils: use 'menuconfig' instead of 'config'+'menu'
      package/angularjs: use 'menuconfig' instead of 'config'+'menu'
      package/angularjs: simplify modules selection
      package/collectd: use 'menuconfig' instead of 'config'+'menu'
      package/gd: use 'menuconfig' instead of 'config'+'menu'
      package/gpsd: use 'menuconfig' instead of 'config'+'menu'
      package/jquery: include external plugins from jquery's Config.in
      package/libdrm: move tests programs to the bottom
      package/libdrm: use 'menuconfig' instead of 'config'+'menu'
      package/mono: use 'menuconfig' instead of 'config'+'menu'
      package/ncftp: use 'menuconfig' instead of 'config'+'menu'
      package/nfs-utils: use 'menuconfig' instead of 'config'+'menu'
      package/nodejs: use 'menuconfig' instead of 'config'+'menu'
      package/ola: use 'menuconfig' instead of 'config'+'menu'
      package/perl: use 'menuconfig' instead of 'config'+'menu'
      package/php: move list of extensions after interface selection
      package/php: use 'menuconfig' instead of 'config'+'menu'
      package/python: use 'menuconfig' instead of 'config'+'menu'
      package/python3: use 'menuconfig' instead of 'config'+'menu'
      package/python{,3}: move inclusion of external python modules
      package/sdl_image: use 'menuconfig' instead of 'config'+'menu'
      package/tcl: use 'menuconfig' instead of 'config'+'menu'
      package/tiff: use 'menuconfig' instead of 'config'+'menu'
      package/udpcast: use 'menuconfig' instead of 'config'+'menu'
      package/gstreamer: include plugins from gstreamer's real Config.in
      package/gstreamer1: include plugins from gstreamer1's real Config.in
      docs/manual: slightly compactify a paragraph
      docs/manual: add ordering of kconfig options' attributes
      docs/manual: add example about sub-options
      docs/manual: use 'menuconfig' when there are more than 5 sub-options
      package/boost: use 'menuconfig'
      package/cairo: use 'menuconfig'
      package/connman: use 'menuconfig'
      package/dejavu: use 'menuconfig'
      package/directfb: use 'menuconfig'
      package/dnsmasq: use 'menuconfig'
      package/dovecot: use 'menuconfig'
      package/dropbear: use 'menuconfig'
      package/e2fsprogs: use 'menuconfig'
      package/efl: use 'menuconfig'
      package/erlang: include Erlang libraries from erlang's Config.in
      package/flot: use 'menuconfig'
      package/gnuradio: use 'menuconfig'
      package/gnuradio: split long omment
      package/google-material-design-icons: use 'menuconfig'
      package/gstreamer: use 'menuconfig'
      package/gstreamer1: use 'menuconfig'
      package/igh-ethercat: use 'menuconfig'
      package/imlib2: use 'menuconfig'
      package/ipsec-tools: use 'menuconfig'
      package/lftp: use 'menuconfig'
      package/libiio: use 'menuconfig'
      package/lighttpd: use 'menuconfig'
      package/linux-firmware: use 'menuconfig'
      package/lm-sensors: use 'menuconfig'
      package/lua{,jit}: move inclusion of external libraries/modules
      package/mtd: use 'menuconfig'
      package/ncurses: use 'menuconfig'
      package/ndisc6: use 'menuconfig'
      package/netsnmp: use 'menuconfig'
      package/ntp: use 'menuconfig'
      package/openobex: use 'menuconfig'
      package/openocd: use 'menuconfig'
      package/poco: use 'menuconfig'
      package/quagga: use 'menuconfig'
      package/sdl: use 'menuconfig'
      package/sdl: include SDL external libraries from sdl's Config.in
      package/sdl_*: remove redundant dependency
      package/squashfs: use 'menuconfig'
      package/sqlite: use 'menuconfig'
      package/transmission: use 'menuconfig'
      package/valgrind: use 'menuconfig'
      package/wpa-supplicant: use 'menuconfig'
      boot/at91bootstrap3: use 'menuconfig'
      boot/barebox: use 'menuconfig'
      boot/grub: use 'menuconfig'
      boot/mxs-bootlets: use 'menuconfig'
      boot/uboot: use 'menuconfig'
      boot/at91bootstrap: choices must have a type

 boot/at91bootstrap/Config.in                   |   2 +-
 boot/at91bootstrap3/Config.in                  |   2 +-
 boot/barebox/Config.in                         |   3 +-
 boot/grub/Config.in                            |  10 +-
 boot/mxs-bootlets/Config.in                    |   2 +-
 boot/uboot/Config.in                           |   3 +-
 docs/manual/adding-packages-directory.txt      |  73 ++++++-
 package/Config.in                              | 252 -------------------------
 package/alsa-lib/Config.in                     |   6 +-
 package/alsa-utils/Config.in                   |   5 +-
 package/angularjs/Config.in                    |  21 +--
 package/angularjs/angularjs.mk                 |  21 ++-
 package/boost/Config.in                        |   2 +-
 package/cairo/Config.in                        |   2 +-
 package/collectd/Config.in                     |  21 +--
 package/connman/Config.in                      |   2 +-
 package/dejavu/Config.in                       |   2 +-
 package/directfb/Config.in                     |   2 +-
 package/dnsmasq/Config.in                      |   2 +-
 package/dovecot/Config.in                      |   2 +-
 package/dropbear/Config.in                     |   2 +-
 package/e2fsprogs/Config.in                    |   3 +-
 package/efl/Config.in                          |   2 +-
 package/erlang/Config.in                       |  17 +-
 package/flot/Config.in                         |   4 +-
 package/gd/Config.in                           |   6 +-
 package/gnuradio/Config.in                     |   9 +-
 package/google-material-design-icons/Config.in |   2 +-
 package/gpsd/Config.in                         |  25 +--
 package/gstreamer/Config.in                    |  12 --
 package/gstreamer/gstreamer/Config.in          |  12 +-
 package/gstreamer1/Config.in                   |  11 --
 package/gstreamer1/gstreamer1/Config.in        |  11 +-
 package/igh-ethercat/Config.in                 |   2 +-
 package/imlib2/Config.in                       |   3 +-
 package/ipsec-tools/Config.in                  |   2 +-
 package/jquery/Config.in                       |  17 +-
 package/lftp/Config.in                         |   2 +-
 package/libdrm/Config.in                       |  14 +-
 package/libiio/Config.in                       |   2 +-
 package/lighttpd/Config.in                     |   2 +-
 package/linux-firmware/Config.in               |   2 +-
 package/lm-sensors/Config.in                   |   3 +-
 package/lua/Config.ext                         |  49 +++++
 package/lua/Config.in                          |   4 +-
 package/luajit/Config.ext                      |   1 +
 package/luajit/Config.in                       |   4 +-
 package/mono/Config.in                         |   8 +-
 package/mtd/Config.in                          |   3 +-
 package/ncftp/Config.in                        |   6 +-
 package/ncurses/Config.in                      |   2 +-
 package/ndisc6/Config.in                       |   2 +-
 package/netsnmp/Config.in                      |   2 +-
 package/nfs-utils/Config.in                    |   6 +-
 package/nodejs/Config.in                       |   6 +-
 package/ntp/Config.in                          |   2 +-
 package/ola/Config.in                          |  14 +-
 package/openobex/Config.in                     |   2 +-
 package/openocd/Config.in                      |   4 +-
 package/perl/Config.in                         |  48 ++++-
 package/php/Config.ext                         |  20 +-
 package/php/Config.in                          |   6 +-
 package/poco/Config.in                         |   4 +-
 package/python/Config.ext                      |  98 ++++++++++
 package/python/Config.in                       |   6 +-
 package/python3/Config.ext                     |   1 +
 package/python3/Config.in                      |   6 +-
 package/quagga/Config.in                       |   2 +-
 package/sdl/Config.in                          |  11 +-
 package/sdl_gfx/Config.in                      |   1 -
 package/sdl_image/Config.in                    |   7 +-
 package/sdl_mixer/Config.in                    |   1 -
 package/sdl_net/Config.in                      |   1 -
 package/sdl_sound/Config.in                    |   1 -
 package/sdl_ttf/Config.in                      |   1 -
 package/sqlite/Config.in                       |   2 +-
 package/squashfs/Config.in                     |   2 +-
 package/tcl/Config.in                          |   7 +-
 package/tiff/Config.in                         |   4 +-
 package/transmission/Config.in                 |   3 +-
 package/udpcast/Config.in                      |   6 +-
 package/valgrind/Config.in                     |   2 +-
 package/wpa_supplicant/Config.in               |   2 +-
 83 files changed, 486 insertions(+), 471 deletions(-)
 create mode 100644 package/lua/Config.ext
 create mode 120000 package/luajit/Config.ext
 create mode 100644 package/python/Config.ext
 create mode 120000 package/python3/Config.ext

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 75/80 v1] boot/at91bootstrap3: use 'menuconfig'

[Yann E. MORIN]

at91bootstrap3 has more than 5 options, so use a 'menuconfig' to
group the options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 boot/at91bootstrap3/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in
index b8ebe80..6f4050c 100644
--- a/boot/at91bootstrap3/Config.in
+++ b/boot/at91bootstrap3/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_AT91BOOTSTRAP3
+menuconfig BR2_TARGET_AT91BOOTSTRAP3
 	depends on BR2_arm926t || BR2_cortex_a5
 	bool "AT91 Bootstrap 3"
 	help
-- 
1.9.1

[Buildroot] [PATCH 76/80 v1] boot/barebox: use 'menuconfig'

[Yann E. MORIN]

barebox has more than 5 options, so use a 'menuconfig' to
group the options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 boot/barebox/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
index 39cb5d2..f27afb6 100644
--- a/boot/barebox/Config.in
+++ b/boot/barebox/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_BAREBOX
+menuconfig BR2_TARGET_BAREBOX
 	bool "Barebox"
 	help
 	  The Barebox bootloader, formerly known as U-Boot v2.
@@ -6,6 +6,7 @@ config BR2_TARGET_BAREBOX
 	  http://www.barebox.org
 
 if BR2_TARGET_BAREBOX
+
 choice
 	prompt "version"
 	help
-- 
1.9.1

[Buildroot] [PATCH 77/80 v1] boot/grub: use 'menuconfig'

[Yann E. MORIN]

grub has more than 5 options, so use a 'menuconfig' to
group the options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 boot/grub/Config.in | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/boot/grub/Config.in b/boot/grub/Config.in
index 4db8642..3ae688f 100644
--- a/boot/grub/Config.in
+++ b/boot/grub/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_GRUB
+menuconfig BR2_TARGET_GRUB
 	bool "grub"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_HOSTARCH_NEEDS_IA32_COMPILER
@@ -52,7 +52,7 @@ config BR2_TARGET_GRUB_DISKLESS
 	help
 	  enable diskless support
 
-menu "filesystem drivers"
+comment "Filesystem drivers"
 
 config BR2_TARGET_GRUB_FS_EXT2
 	bool "ext2"
@@ -86,9 +86,7 @@ config BR2_TARGET_GRUB_FS_XFS
 	help
 	  Enable support for the XFS filesystem in Grub.
 
-endmenu
-
-menu "network drivers"
+comment "Network drivers"
 
 config BR2_TARGET_GRUB_3c595
 	bool "3Com595 driver"
@@ -195,6 +193,4 @@ config BR2_TARGET_GRUB_w89c840
 	help
 	  enable Winbond W89c840 driver
 
-endmenu
-
 endif # BR2_TARGET_GRUB
-- 
1.9.1

[Buildroot] [PATCH 78/80 v1] boot/mxs-bootlets: use 'menuconfig'

[Yann E. MORIN]

mxs-bootlets has 5 options, so use a 'menuconfig' to
group the options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 boot/mxs-bootlets/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in
index 4bb07a0..2712d8d 100644
--- a/boot/mxs-bootlets/Config.in
+++ b/boot/mxs-bootlets/Config.in
@@ -1,4 +1,4 @@
-config BR2_TARGET_MXS_BOOTLETS
+menuconfig BR2_TARGET_MXS_BOOTLETS
 	bool "mxs-bootlets"
 	depends on BR2_arm
 	help
-- 
1.9.1

[Buildroot] [PATCH 79/80 v1] boot/uboot: use 'menuconfig'

[Yann E. MORIN]

uboot has more than 5 options, so use a 'menuconfig' to
group the options in an sub-menu.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 boot/uboot/Config.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index b75006b..a4b2372 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -1,9 +1,10 @@
-config BR2_TARGET_UBOOT
+menuconfig BR2_TARGET_UBOOT
 	bool "U-Boot"
 	help
 	  Build "Das U-Boot" Boot Monitor
 
 if BR2_TARGET_UBOOT
+
 choice
 	prompt "Build system"
 	default BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
-- 
1.9.1

[Buildroot] [PATCH 80/80 v1] boot/at91bootstrap: choices must have a type

[Yann E. MORIN]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 boot/at91bootstrap/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/at91bootstrap/Config.in b/boot/at91bootstrap/Config.in
index 57fdeda..d131a6a 100644
--- a/boot/at91bootstrap/Config.in
+++ b/boot/at91bootstrap/Config.in
@@ -26,7 +26,7 @@ config BR2_TARGET_AT91BOOTSTRAP_BOARD
 	  This is used to do a make <board>_config
 
 choice
-	prompt "Boot Memory"
+	bool "Boot Memory"
 	default BR2_TARGET_AT91BOOTSTRAP_DATAFLASH
 	help
 	  Select Chip for which AT91 bootstrap should be built
-- 
1.9.1

[Buildroot] [PATCH 01/80 v1] package/alsa-lib: use 'menuconfig' instead of 'config'+'menu'

[Thomas Petazzoni]

Dear Yann E. MORIN,

On Sat, 16 Jan 2016 23:36:53 +0100, Yann E. MORIN wrote:
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

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

[Buildroot] [PATCH 02/80 v1] package/alsa-utils: use 'menuconfig' instead of 'config'+'menu'

[Thomas Petazzoni]

Dear Yann E. MORIN,

On Sat, 16 Jan 2016 23:36:54 +0100, Yann E. MORIN wrote:
> Drop the now useless comment.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> ---

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

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

[Buildroot] [PATCH 03/80 v1] package/angularjs: use 'menuconfig' instead of 'config'+'menu'

[Thomas Petazzoni]

Dear Yann E. MORIN,

On Sat, 16 Jan 2016 23:36:55 +0100, Yann E. MORIN wrote:
> ... and change the modules 'menuconfig' to a simple 'config'
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

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

[Buildroot] [PATCH 04/80 v1] package/angularjs: simplify modules selection

[Thomas Petazzoni]

Yann,

On Sat, 16 Jan 2016 23:36:56 +0100, Yann E. MORIN wrote:
> Remove the superfluous config option, and make all modules default to
> 'y', which provides exactly the same functionality.
> 
> simplify (and slightly beautify) the handling of modules in the .mk:
> since the modules' symbols are always meaningful now, we can get rid of
> the else-clause, and always build the list of modules using the Kconfig
> options.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> 
> ---

You have an empty line at the end of many commit logs.

I agree with the principle of the patch, but sometimes is odd:


> +# This list mirrors the list of available modules from Config.in.
> +# Keep this list in sync and in the same (alphabetical) order as the
> +# one in Config.in. However, always keep 'angular' first in the list.

You say "angular" must be first in the list...

> +ANGULARJS_MODULES = \
> +	animate \
> +	aria \
> +	cookies \
> +	messages \
> +	message-format \
> +	resource \
> +	route \
> +	sanitize \
> +	touch

But there is no "angular" in this list.

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

[Buildroot] [PATCH 05/80 v1] package/collectd: use 'menuconfig' instead of 'config'+'menu'

[Thomas Petazzoni]

Dear Yann E. MORIN,

On Sat, 16 Jan 2016 23:36:57 +0100, Yann E. MORIN wrote:
> Since there were multiple sub-menus, keep their prompts as a comment, to
> properly separate all famillies of plugins.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

It is really a matter of taste, so my opinion is clearly not a strong
one here. But I believe I actually prefer the current solution. With
your solution yes all sub-options are hidden behind a menu. But this
menu is now very long, and I find the "comment" in Kconfig to not be
very nice separators to separate various parts of the menu.

They are even more confusing in that there are "comments" used as
separators, and real "comments" about missing dependencies, causing
confusion.

So I'm not too fan of this one, but if Arnout and you are happy with it
and Peter likes it, that's OK, it's really a minor detail from my point
of view.

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

[Buildroot] [PATCH 04/80 v1] package/angularjs: simplify modules selection

[Yann E. MORIN]

Thomas, All,

On 2016-01-18 22:48 +0100, Thomas Petazzoni spake thusly:
> On Sat, 16 Jan 2016 23:36:56 +0100, Yann E. MORIN wrote:
> > Remove the superfluous config option, and make all modules default to
> > 'y', which provides exactly the same functionality.
> > 
> > simplify (and slightly beautify) the handling of modules in the .mk:
> > since the modules' symbols are always meaningful now, we can get rid of
> > the else-clause, and always build the list of modules using the Kconfig
> > options.
> > 
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > 
> > ---
> 
> You have an empty line at the end of many commit logs.

Yup, there's an empty line because I added a '---' comment and I always
separate them with an empty line so they are properly separated from the
commit log itself. But that's no a problem, since git-am (and thus
pwclient git-am does too):
  - drops the --- comments
  - drops emtpy trailing lines

> I agree with the principle of the patch, but sometimes is odd:
> 
> 
> > +# This list mirrors the list of available modules from Config.in.
> > +# Keep this list in sync and in the same (alphabetical) order as the
> > +# one in Config.in. However, always keep 'angular' first in the list.
> 
> You say "angular" must be first in the list...

Damn, I forgot to remove that part when I moved back 'angular' out of
the modules list.

Thanks! :-)

Regards,
Yann E. MORIN.

> > +ANGULARJS_MODULES = \
> > +	animate \
> > +	aria \
> > +	cookies \
> > +	messages \
> > +	message-format \
> > +	resource \
> > +	route \
> > +	sanitize \
> > +	touch
> 
> But there is no "angular" in this list.
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 05/80 v1] package/collectd: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Thomas, All,

On 2016-01-18 22:56 +0100, Thomas Petazzoni spake thusly:
> On Sat, 16 Jan 2016 23:36:57 +0100, Yann E. MORIN wrote:
> > Since there were multiple sub-menus, keep their prompts as a comment, to
> > properly separate all famillies of plugins.
> > 
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> 
> It is really a matter of taste, so my opinion is clearly not a strong
> one here. But I believe I actually prefer the current solution. With
> your solution yes all sub-options are hidden behind a menu. But this
> menu is now very long, and I find the "comment" in Kconfig to not be
> very nice separators to separate various parts of the menu.
> 
> They are even more confusing in that there are "comments" used as
> separators, and real "comments" about missing dependencies, causing
> confusion.
> 
> So I'm not too fan of this one, but if Arnout and you are happy with it
> and Peter likes it, that's OK, it's really a minor detail from my point
> of view.

I am very much and totally undecided on this either...

On one hand, sub-menus in sub-menus can be a bit tedious to navigate in,
hence the change to use comments a separators.

On the other hand, the new layout is definitely quite long, indeed, and
difficult to navigate as well.

I'll revert to use sub-menus, unless Peter chimes in to voice his
preference for the new layout.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 05/80 v1] package/collectd: use 'menuconfig' instead of 'config'+'menu'

[Thomas Petazzoni]

Dear Yann E. MORIN,

On Mon, 18 Jan 2016 23:00:15 +0100, Yann E. MORIN wrote:

> I am very much and totally undecided on this either...
> 
> On one hand, sub-menus in sub-menus can be a bit tedious to navigate in,
> hence the change to use comments a separators.
> 
> On the other hand, the new layout is definitely quite long, indeed, and
> difficult to navigate as well.
> 
> I'll revert to use sub-menus, unless Peter chimes in to voice his
> preference for the new layout.

But do we need to change anything at all for this patch?

While I agree that the alsa-lib and alsa-utils cases were silly,
because we had a single sub-options that did nothing but give access to
the sub-menu.

But in the case of collectd, the current situation looks good to me,
and I don't see the need to introduce a sub-menu for it.

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

[Buildroot] [PATCH 05/80 v1] package/collectd: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Thomas, All,

On 2016-01-18 23:05 +0100, Thomas Petazzoni spake thusly:
> On Mon, 18 Jan 2016 23:00:15 +0100, Yann E. MORIN wrote:
> > I am very much and totally undecided on this either...
> > 
> > On one hand, sub-menus in sub-menus can be a bit tedious to navigate in,
> > hence the change to use comments a separators.
> > 
> > On the other hand, the new layout is definitely quite long, indeed, and
> > difficult to navigate as well.
> > 
> > I'll revert to use sub-menus, unless Peter chimes in to voice his
> > preference for the new layout.
> 
> But do we need to change anything at all for this patch?
> 
> While I agree that the alsa-lib and alsa-utils cases were silly,
> because we had a single sub-options that did nothing but give access to
> the sub-menu.
> 
> But in the case of collectd, the current situation looks good to me,
> and I don't see the need to introduce a sub-menu for it.

Well, the idea is that all packages that have sub-options all use the
same layout, so that the menuconfig really is more consistent than it is
today.

Now, tastes are very personal! ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 05/80 v1] package/collectd: use 'menuconfig' instead of 'config'+'menu'

[Thomas Petazzoni]

Hello,

On Mon, 18 Jan 2016 23:18:08 +0100, Yann E. MORIN wrote:

> > But in the case of collectd, the current situation looks good to me,
> > and I don't see the need to introduce a sub-menu for it.
> 
> Well, the idea is that all packages that have sub-options all use the
> same layout, so that the menuconfig really is more consistent than it is
> today.

Well, they won't all have a sub-menu, since according to the second
part of your patch series, only those packages that have more than 5
sub-options are converted to use a sub-menu.

Aren't we bike-shedding here? :-)

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

[Buildroot] [PATCH 05/80 v1] package/collectd: use 'menuconfig' instead of 'config'+'menu'

[Yann E. MORIN]

Thomas, All,

On 2016-01-18 23:27 +0100, Thomas Petazzoni spake thusly:
> On Mon, 18 Jan 2016 23:18:08 +0100, Yann E. MORIN wrote:
> > > But in the case of collectd, the current situation looks good to me,
> > > and I don't see the need to introduce a sub-menu for it.
> > 
> > Well, the idea is that all packages that have sub-options all use the
> > same layout, so that the menuconfig really is more consistent than it is
> > today.
> 
> Well, they won't all have a sub-menu, since according to the second
> part of your patch series, only those packages that have more than 5
> sub-options are converted to use a sub-menu.

Indeed (nit-pick: it's 5-or-more, i.e [1..4] do not warrant a sub-menu,
while [5..?[ do; but 5 is just arbitrary, we can change that).

> Aren't we bike-shedding here? :-)

And to bike-shed a bit more: collectd does have 5-or-more options, and
even has 5 sub-menus as of today, and thus would get a sub-menu under
this new rule anyway! Hehe! ;-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 76/80 v1] boot/barebox: use 'menuconfig'

[Yegor Yefremov]

On Sat, Jan 16, 2016 at 11:38 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> barebox has more than 5 options, so use a 'menuconfig' to
> group the options in an sub-menu.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com>

> ---
>  boot/barebox/Config.in | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in
> index 39cb5d2..f27afb6 100644
> --- a/boot/barebox/Config.in
> +++ b/boot/barebox/Config.in
> @@ -1,4 +1,4 @@
> -config BR2_TARGET_BAREBOX
> +menuconfig BR2_TARGET_BAREBOX
>         bool "Barebox"
>         help
>           The Barebox bootloader, formerly known as U-Boot v2.
> @@ -6,6 +6,7 @@ config BR2_TARGET_BAREBOX
>           http://www.barebox.org
>
>  if BR2_TARGET_BAREBOX
> +
>  choice
>         prompt "version"
>         help
> --
> 1.9.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 0/80 v1] pakages: use menuconfig to group sub-options (branch yem/menuconfig)

[Thomas Petazzoni]

Yann,

On Sat, 16 Jan 2016 23:38:07 +0100, Yann E. MORIN wrote:

> Yann E. MORIN (80):
>       package/alsa-lib: use 'menuconfig' instead of 'config'+'menu'
>       package/alsa-utils: use 'menuconfig' instead of 'config'+'menu'
>       package/angularjs: use 'menuconfig' instead of 'config'+'menu'

Those first three patches applied.

>       docs/manual: slightly compactify a paragraph
>       docs/manual: add ordering of kconfig options' attributes

Those two ones as well.

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