Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 10/25] fix ordering on configs starting with 'j'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter j in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter j.
  
 package/janus-gateway/Config.in | 8 ++++----
 package/joe/Config.in           | 2 +-
 package/jsoncpp/Config.in       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in
index 5c7b633..e07b4ad 100644
--- a/package/janus-gateway/Config.in
+++ b/package/janus-gateway/Config.in
@@ -1,14 +1,14 @@
 menuconfig BR2_PACKAGE_JANUS_GATEWAY
 	bool "janus-gateway"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_WCHAR # libnice -> libglib2
+	depends on BR2_USE_MMU # libnice
+	depends on !BR2_STATIC_LIBS # dlopen
 	select BR2_PACKAGE_JANSSON
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBNICE
 	select BR2_PACKAGE_LIBSRTP
 	select BR2_PACKAGE_OPENSSL
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
-	depends on BR2_USE_WCHAR # libnice -> libglib2
-	depends on BR2_USE_MMU # libnice
-	depends on !BR2_STATIC_LIBS # dlopen
 	help
 	  Janus is an open source, general purpose, WebRTC gateway
 	  designed and developed by Meetecho.
diff --git a/package/joe/Config.in b/package/joe/Config.in
index eabfae7..f335e05 100644
--- a/package/joe/Config.in
+++ b/package/joe/Config.in
@@ -13,8 +13,8 @@ config BR2_PACKAGE_JOE
 
 config BR2_PACKAGE_JOE_FULL
 	bool "full install of rc and syntax highlighting files"
-	depends on BR2_PACKAGE_JOE
 	default y
+	depends on BR2_PACKAGE_JOE
 	help
 	  Install all rc and syntax highlighting files. Without this option
 	  only the joe binary is installed, which contains a default
diff --git a/package/jsoncpp/Config.in b/package/jsoncpp/Config.in
index 83118c4..a6c6b91 100644
--- a/package/jsoncpp/Config.in
+++ b/package/jsoncpp/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_JSONCPP
+	bool "jsoncpp"
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
 	depends on BR2_INSTALL_LIBSTDCPP
-	bool "jsoncpp"
 	help
 	  JsonCpp is a C++ library that allows manipulating JSON
 	  values, including serialization and deserialization to and
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 09/25] fix ordering on configs starting with 'i'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter i in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter i.
  
 package/iftop/Config.in       | 2 +-
 package/imlib2/Config.in      | 2 +-
 package/iprutils/Config.in    | 4 ++--
 package/ipsec-tools/Config.in | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/iftop/Config.in b/package/iftop/Config.in
index 8c6ae0c..f80a831 100644
--- a/package/iftop/Config.in
+++ b/package/iftop/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_IFTOP
 	bool "iftop"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBPCAP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  iftop does for network usage what top(1) does for CPU usage.
 	  It listens to network traffic on a named interface and displays
diff --git a/package/imlib2/Config.in b/package/imlib2/Config.in
index 7aac074..c47178f 100644
--- a/package/imlib2/Config.in
+++ b/package/imlib2/Config.in
@@ -3,8 +3,8 @@ comment "imlib2 needs a toolchain w/ dynamic library"
 
 config BR2_PACKAGE_IMLIB2
 	bool "imlib2"
-	select BR2_PACKAGE_FREETYPE
 	depends on !BR2_STATIC_LIBS # dlopen()
+	select BR2_PACKAGE_FREETYPE
 	help
 	  Imlib 2 is the successor to Imlib. This library provides
 	  routines to load, save and render images in various formats.
diff --git a/package/iprutils/Config.in b/package/iprutils/Config.in
index b429e71..8e2884a 100644
--- a/package/iprutils/Config.in
+++ b/package/iprutils/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_IPRUTILS
 	bool "iprutils"
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_bfin # pciutils
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBSYSFS
 	select BR2_PACKAGE_PCIUTILS
-	depends on BR2_USE_MMU # fork()
-	depends on !BR2_bfin # pciutils
 	help
 	  System utilities for IBM Power RAID devices
 
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 36c5a65..1635675 100644
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -12,8 +12,8 @@ config BR2_PACKAGE_IPSEC_TOOLS
 if BR2_PACKAGE_IPSEC_TOOLS
 
 config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
-	default y
 	bool "Enable racoonctl(8)"
+	default y
 	help
 	  Lets racoon to listen to racoon admin port, which is to
 	  be contacted by racoonctl(8).
@@ -42,12 +42,12 @@ config BR2_PACKAGE_IPSEC_TOOLS_DPD
 	  Enable dead peer detection support
 
 config BR2_PACKAGE_IPSEC_TOOLS_STATS
-	default y
 	bool "Enable statistics logging function"
+	default y
 
 config BR2_PACKAGE_IPSEC_TOOLS_READLINE
-	select BR2_PACKAGE_READLINE
 	bool "Enable readline input support"
+	select BR2_PACKAGE_READLINE
 
 config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
 	bool "Enable hybrid, both mode-cfg and xauth support"
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 08/25] fix ordering on configs starting with 'g'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter g in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter g.
  - Updated to work with new gdb/Config.in.host
  
 package/gdb/Config.in                          |  6 +++---
 package/gdb/Config.in.host                     |  4 ++--
 package/gesftpserver/Config.in                 |  2 +-
 package/glibmm/Config.in                       |  4 ++--
 package/gnupg/Config.in                        |  2 +-
 package/gnupg2/Config.in                       |  8 ++++----
 package/gnutls/Config.in                       |  2 +-
 package/gptfdisk/Config.in                     |  4 ++--
 package/gstreamer/gst-fsl-plugins/Config.in    | 16 ++++++++--------
 package/gstreamer/gst-plugins-bad/Config.in    |  4 ++--
 package/gstreamer/gst-plugins-good/Config.in   |  2 +-
 package/gstreamer1/gst1-plugins-bad/Config.in  | 10 +++++-----
 package/gstreamer1/gst1-plugins-base/Config.in |  2 +-
 package/gstreamer1/gst1-plugins-good/Config.in |  6 +++---
 package/gstreamer1/gst1-vaapi/Config.in        |  6 +++---
 package/gupnp-tools/Config.in                  |  2 +-
 16 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/package/gdb/Config.in b/package/gdb/Config.in
index 809e02d..026cdea 100644
--- a/package/gdb/Config.in
+++ b/package/gdb/Config.in
@@ -4,13 +4,13 @@ comment "gdb/gdbserver needs a toolchain w/ threads, threads debug"
 
 config BR2_PACKAGE_GDB
 	bool "gdb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	depends on !BR2_nios2 && !BR2_bfin
 	# When the external toolchain gdbserver is copied to the
 	# target, we don't allow building a separate gdbserver. The
 	# one from the external toolchain should be used.
 	select BR2_PACKAGE_GDB_SERVER if \
 		(!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
-	depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	depends on !BR2_nios2 && !BR2_bfin
 	help
 	  GDB, the GNU Project debugger, allows you to see what is
 	  going on `inside' another program while it executes -- or
@@ -38,9 +38,9 @@ config BR2_PACKAGE_GDB_SERVER
 
 config BR2_PACKAGE_GDB_DEBUGGER
 	bool "full debugger"
-	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
 	depends on !BR2_sh && !BR2_microblaze
+	select BR2_PACKAGE_NCURSES
 
 comment "full gdb on target needs a toolchain w/ wchar"
 	depends on !BR2_sh && !BR2_microblaze
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index a059fdc..62b5b1a 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -33,9 +33,9 @@ config BR2_PACKAGE_HOST_GDB_SIM
 
 choice
 	prompt "GDB debugger Version"
+	default BR2_GDB_VERSION_7_11
 	depends on !BR2_arc
 	depends on !BR2_microblaze
-	default BR2_GDB_VERSION_7_11
 	help
 	  Select the version of gdb you wish to use.
 
@@ -55,9 +55,9 @@ endif
 # If cross-gdb is not enabled, the latest working version is chosen.
 config BR2_GDB_VERSION
 	string
-	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
 	default "arc-2017.03-rc1-gdb" if BR2_arc
 	default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
 	default "7.10.1"   if BR2_GDB_VERSION_7_10
 	default "7.11.1"   if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB
 	default "7.12.1"   if BR2_GDB_VERSION_7_12
+	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
diff --git a/package/gesftpserver/Config.in b/package/gesftpserver/Config.in
index 81cbce9..bce4770 100644
--- a/package/gesftpserver/Config.in
+++ b/package/gesftpserver/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_GESFTPSERVER
 	bool "gesftpserver"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Green End SFTP Server
 
diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in
index fdbb438..7218db2 100644
--- a/package/glibmm/Config.in
+++ b/package/glibmm/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_GLIBMM
 	bool "glibmm"
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_LIBSIGC
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBSIGC
 	help
 	  The GLibmm package is a set of C++ bindings for GLib.
 
diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in
index 30f215f..7c31612 100644
--- a/package/gnupg/Config.in
+++ b/package/gnupg/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_GNUPG
 	bool "gnupg"
+	depends on !BR2_PACKAGE_GNUPG2
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_NCURSES
-	depends on !BR2_PACKAGE_GNUPG2
 	help
 	  GnuPG is the GNU project's complete and free implementation
 	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in
index 85a9805..c287089 100644
--- a/package/gnupg2/Config.in
+++ b/package/gnupg2/Config.in
@@ -4,6 +4,10 @@ comment "gnupg2 needs a toolchain w/ threads and dynamic library support"
 
 config BR2_PACKAGE_GNUPG2
 	bool "gnupg2"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth
+	depends on BR2_USE_MMU # libassuan, libnpth
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBGPG_ERROR
 	select BR2_PACKAGE_LIBGCRYPT
@@ -11,10 +15,6 @@ config BR2_PACKAGE_GNUPG2
 	select BR2_PACKAGE_LIBKSBA
 	select BR2_PACKAGE_LIBNPTH
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth
-	depends on BR2_USE_MMU # libassuan, libnpth
-	depends on !BR2_STATIC_LIBS
 	help
 	  GnuPG is the GNU project's complete and free implementation
 	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index cfb7cb3..1af00cd 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBTASN1
 	select BR2_PACKAGE_LIBUNISTRING
 	select BR2_PACKAGE_NETTLE
 	select BR2_PACKAGE_PCRE
-	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
diff --git a/package/gptfdisk/Config.in b/package/gptfdisk/Config.in
index 22dc401..d243b90 100644
--- a/package/gptfdisk/Config.in
+++ b/package/gptfdisk/Config.in
@@ -35,10 +35,10 @@ config BR2_PACKAGE_GPTFDISK_SGDISK
 
 config BR2_PACKAGE_GPTFDISK_CGDISK
 	bool "ncurses cgdisk"
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16
 	depends on BR2_USE_WCHAR # ncurses wchar
 	depends on !(BR2_bfin && BR2_BINFMT_FLAT) # ncurses wchar support
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16
 	help
 	  Install the ncurses-based GUID partition table (GPT)
 	  manipulator /usr/sbin/cgdisk.
diff --git a/package/gstreamer/gst-fsl-plugins/Config.in b/package/gstreamer/gst-fsl-plugins/Config.in
index 8921aa3..85476b1 100644
--- a/package/gstreamer/gst-fsl-plugins/Config.in
+++ b/package/gstreamer/gst-fsl-plugins/Config.in
@@ -45,12 +45,12 @@ config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233
 	bool "imx233"
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
 	bool "imx25"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
 	bool "imx27"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28
 	bool "imx28"
@@ -62,28 +62,28 @@ config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35
 	bool "imx35"
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
 	bool "imx37"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
 	bool "imx50"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
 	bool "imx51"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
 	bool "imx53"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X
 	bool "imx5X"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
 	bool "imx6"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
 
 endchoice
 
diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
index d54415a..939fc7a 100644
--- a/package/gstreamer/gst-plugins-bad/Config.in
+++ b/package/gstreamer/gst-plugins-bad/Config.in
@@ -57,8 +57,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 	bool "debugutils"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK
-	depends on BR2_INSTALL_LIBSTDCPP
 	bool "decklink"
+	depends on BR2_INSTALL_LIBSTDCPP
 
 comment "decklink needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
@@ -261,8 +261,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
-	depends on BR2_PACKAGE_DIRECTFB
 	default y
+	depends on BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
index 65f74e8..a36481a 100644
--- a/package/gstreamer/gst-plugins-good/Config.in
+++ b/package/gstreamer/gst-plugins-good/Config.in
@@ -201,12 +201,12 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
 	bool "oss4 (Open Sound System 4)"
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
+	bool "pulseaudio"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
 	depends on BR2_USE_MMU # pulseaudio
 	depends on !BR2_STATIC_LIBS # pulseaudio
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
 	select BR2_PACKAGE_PULSEAUDIO
-	bool "pulseaudio"
 
 comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in
index 1db5187..17cc22b 100644
--- a/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -489,8 +489,8 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH
 	  DASH demuxer plugin
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
-	depends on BR2_INSTALL_LIBSTDCPP
 	bool "decklink"
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Blackmagic Decklink plugin
 
@@ -499,14 +499,14 @@ comment "decklink needs a toolchain w/ C++"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
-	depends on BR2_PACKAGE_DIRECTFB
 	default y
+	depends on BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
-	select BR2_PACKAGE_DTV_SCAN_TABLES
 	# FEC_2_5 / QAM_4_NR definitions
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	select BR2_PACKAGE_DTV_SCAN_TABLES
 	help
 	  DVB elements
 
@@ -526,9 +526,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC
 	bool "fdk-aac"
-	select BR2_PACKAGE_FDK_AAC
 	depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_FDK_AAC
 	help
 	  MPEG AAC encoder/decoder
 
@@ -686,9 +686,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
 	bool "wayland"
+	default y
 	depends on BR2_PACKAGE_WAYLAND
 	select BR2_PACKAGE_WAYLAND_PROTOCOLS
-	default y
 	help
 	  Wayland Video Sink
 
diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
index 897c1d1..a17f2ad 100644
--- a/package/gstreamer1/gst1-plugins-base/Config.in
+++ b/package/gstreamer1/gst1-plugins-base/Config.in
@@ -54,9 +54,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO
 	  GIO elements
 
 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND
 	bool "playback"
 	default y
+	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND
 	help
 	  various playback elements
 
diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 27f24f5..9d23e9f 100644
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -306,9 +306,9 @@ comment "flac needs a toolchain w/ wchar"
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
 	bool "gdkpixbuf"
-	select BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
+	select BR2_PACKAGE_GDK_PIXBUF
 	help
 	  GdkPixbuf-based image decoder, overlay and sink
 
@@ -316,12 +316,12 @@ comment "gdkpixbuf needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
+	bool "pulseaudio"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
 	depends on BR2_USE_MMU # pulseaudio
 	depends on !BR2_STATIC_LIBS # pulseaudio
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
 	select BR2_PACKAGE_PULSEAUDIO
-	bool "pulseaudio"
 	help
 	  PulseAudio plugin library
 
@@ -360,9 +360,9 @@ comment "taglib needs a toolchain w/ C++, wchar"
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	bool "vpx (webm)"
-	select BR2_PACKAGE_LIBVPX
 	depends on !BR2_bfin # libvpx
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx
+	select BR2_PACKAGE_LIBVPX
 	help
 	  VP8 plugin
 
diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in
index 0b8ae39..91bd4f8 100644
--- a/package/gstreamer1/gst1-vaapi/Config.in
+++ b/package/gstreamer1/gst1-vaapi/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_GST1_VAAPI
 	bool "gst1-vaapi"
+	depends on !BR2_STATIC_LIBS # dlopen(), libva
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libva, libdrm
+	depends on BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_LIBVA
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers
-	depends on !BR2_STATIC_LIBS # dlopen(), libva
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libva, libdrm
-	depends on BR2_PACKAGE_HAS_UDEV
 	help
 	  gstreamer-vaapi consists in a collection of VA-API based
 	  plugins for GStreamer and helper libraries.
diff --git a/package/gupnp-tools/Config.in b/package/gupnp-tools/Config.in
index f9e645a..af66241 100644
--- a/package/gupnp-tools/Config.in
+++ b/package/gupnp-tools/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GUPNP_TOOLS
 	bool "gupnp-tools"
+	depends on BR2_PACKAGE_LIBGTK3
 	# gssdp, gupnp, libsoup all select on libglib2, so they have
 	# the same dependencies as libgtk3, which we depend on. So for
 	# the same of simplicity, we don't replicate all those
@@ -8,7 +9,6 @@ config BR2_PACKAGE_GUPNP_TOOLS
 	select BR2_PACKAGE_GUPNP
 	select BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBXML2
-	depends on BR2_PACKAGE_LIBGTK3
 	help
 	  GUPnP Tools are free replacements of Intel UPnP tools that
 	  use GUPnP. They provides client and server side tools which
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 07/25] fix ordering on configs starting with 'f'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter f in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter f.
  
 package/f2fs-tools/Config.in                     | 2 +-
 package/faifa/Config.in                          | 2 +-
 package/fastd/Config.in                          | 2 +-
 package/fetchmail/Config.in                      | 2 +-
 package/ffmpeg/Config.in                         | 2 +-
 package/filemq/Config.in                         | 6 +++---
 package/flashrom/Config.in                       | 4 ++--
 package/freescale-imx/gpu-amd-bin-mx51/Config.in | 8 ++++----
 package/freescale-imx/imx-gpu-viv/Config.in      | 6 +++---
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package/f2fs-tools/Config.in b/package/f2fs-tools/Config.in
index ab81734..f0630e9 100644
--- a/package/f2fs-tools/Config.in
+++ b/package/f2fs-tools/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_F2FS_TOOLS
 	bool "f2fs-tools"
+	depends on BR2_USE_WCHAR # uses wchar_t
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
-	depends on BR2_USE_WCHAR # uses wchar_t
 	help
 	  Tools for Flash-Friendly File System (F2FS)
 
diff --git a/package/faifa/Config.in b/package/faifa/Config.in
index de2cc79..753abc6 100644
--- a/package/faifa/Config.in
+++ b/package/faifa/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_FAIFA
 	bool "faifa"
-	select BR2_PACKAGE_LIBPCAP
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBPCAP
 	help
 	  Faifa can configure any Intellon-based Power Line
 	  Communication device using Intellon INT5000 and INT6000
diff --git a/package/fastd/Config.in b/package/fastd/Config.in
index 546d449..47c76b5 100644
--- a/package/fastd/Config.in
+++ b/package/fastd/Config.in
@@ -16,8 +16,8 @@ if BR2_PACKAGE_FASTD
 config BR2_PACKAGE_FASTD_STATUS_SOCKET
 	bool "status socket support"
 	default y
-	select BR2_PACKAGE_JSON_C
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+	select BR2_PACKAGE_JSON_C
 	help
 	  Enable support for a socket to get fastd's status.
 
diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in
index 1eb0359..1e829a0 100644
--- a/package/fetchmail/Config.in
+++ b/package/fetchmail/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_FETCHMAIL
 	bool "fetchmail"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_CA_CERTIFICATES
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	depends on BR2_USE_MMU # fork()
 	help
 	  Fetchmail - the mail-retrieval daemon
 	  Client daemon to move mail from POP and IMAP to your local computer
diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index b5850db..383374d 100644
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -40,9 +40,9 @@ config BR2_PACKAGE_FFMPEG_FFMPEG
 
 config BR2_PACKAGE_FFMPEG_FFPLAY
 	bool "Build ffplay"
+	depends on !BR2_STATIC_LIBS # sdl2
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	select BR2_PACKAGE_SDL2
-	depends on !BR2_STATIC_LIBS # sdl2
 	help
 	  FFplay is a very simple and portable media player using the
 	  FFmpeg libraries and the SDL library.
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
index e06a267..b4720c1 100644
--- a/package/filemq/Config.in
+++ b/package/filemq/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_FILEMQ
 	bool "filemq"
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_CZMQ
-	select BR2_PACKAGE_ZEROMQ
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on BR2_USE_MMU # czmq
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_CZMQ
+	select BR2_PACKAGE_ZEROMQ
 	help
 	  FileMQ is a publish-subscribe file service based on 0MQ.
 
diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in
index adc068c..e7844a0 100644
--- a/package/flashrom/Config.in
+++ b/package/flashrom/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_FLASHROM
 	bool "flashrom"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_PCIUTILS
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	select BR2_PACKAGE_LIBFTDI
 	# dmidecode is only a runtime dependency
 	select BR2_PACKAGE_DMIDECODE
-	depends on BR2_i386 || BR2_x86_64
-	depends on BR2_TOOLCHAIN_HAS_THREADS 	# libusb
 	help
 	  flashrom is a utility for identifying, reading, writing,
 	  verifying and erasing flash chips. It is designed to flash
diff --git a/package/freescale-imx/gpu-amd-bin-mx51/Config.in b/package/freescale-imx/gpu-amd-bin-mx51/Config.in
index 337713c..cd66c73 100644
--- a/package/freescale-imx/gpu-amd-bin-mx51/Config.in
+++ b/package/freescale-imx/gpu-amd-bin-mx51/Config.in
@@ -5,12 +5,12 @@ comment "gpu-amd-bin-mx51 needs a glibc EABI toolchain w/ C++"
 
 config BR2_PACKAGE_GPU_AMD_BIN_MX51
 	bool "gpu-amd-bin-mx51 (also imx53)"
-	select BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_HAS_LIBGLES
-	select BR2_PACKAGE_HAS_LIBOPENVG
 	depends on BR2_ARM_EABI
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_HAS_LIBEGL
+	select BR2_PACKAGE_HAS_LIBGLES
+	select BR2_PACKAGE_HAS_LIBOPENVG
 	help
 	  Freescale libraries, headers and executables for the
 	  AMD GPU on i.MX5x, containing OpenGL/ES, OpenVG
@@ -26,6 +26,7 @@ choice
 	  Choose here which version to install.
 
 config BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11
+	bool "X11"
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBXCB
 	select BR2_PACKAGE_XLIB_LIBX11
@@ -33,7 +34,6 @@ config BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXAU
-	bool "X11"
 
 comment "X11 backend needs X.org enabled"
 	depends on !BR2_PACKAGE_XORG7
diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in
index effb24b..dba378c 100644
--- a/package/freescale-imx/imx-gpu-viv/Config.in
+++ b/package/freescale-imx/imx-gpu-viv/Config.in
@@ -4,13 +4,13 @@ comment "imx-gpu-viv needs a glibc toolchain with armhf enabled"
 
 config BR2_PACKAGE_IMX_GPU_VIV
 	bool "imx-gpu-viv"
-	select BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_HAS_LIBGLES
-	select BR2_PACKAGE_HAS_LIBOPENVG
 	# Pre-built binaries only available for ARM EABIhf
 	depends on BR2_ARM_EABIHF
 	# Library binaries are linked against libc.so.6
 	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_HAS_LIBEGL
+	select BR2_PACKAGE_HAS_LIBGLES
+	select BR2_PACKAGE_HAS_LIBOPENVG
 	help
 	  Userspace libraries for Vivante GPU on i.MX6 platforms
 
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 06/25] fix ordering on configs starting with 'e'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter e in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter e.
  
 package/e2tools/Config.in        |  2 +-
 package/easydbus/Config.in       |  2 +-
 package/ecryptfs-utils/Config.in | 14 +++++++-------
 package/efivar/Config.in         |  2 +-
 package/elfutils/Config.in       |  6 +++---
 package/execline/Config.in       |  2 +-
 package/exiv2/Config.in          |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/package/e2tools/Config.in b/package/e2tools/Config.in
index 75029f7..e4a35e2 100644
--- a/package/e2tools/Config.in
+++ b/package/e2tools/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_E2TOOLS
 	bool "e2tools"
-	select BR2_PACKAGE_E2FSPROGS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR # uses wchar_t
 	depends on BR2_USE_MMU # e2fsprogs
+	select BR2_PACKAGE_E2FSPROGS
 	help
 	  E2tools is a simple set of GPL'ed utilities to read, write,
 	  and manipulate files in an ext2/ext3 filesystem. These
diff --git a/package/easydbus/Config.in b/package/easydbus/Config.in
index 51519d6..1fe8689 100644
--- a/package/easydbus/Config.in
+++ b/package/easydbus/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_EASYDBUS
 	bool "easydbus"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Easy to use DBus library for Lua.
 
diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in
index cb70e00..078ca36 100644
--- a/package/ecryptfs-utils/Config.in
+++ b/package/ecryptfs-utils/Config.in
@@ -1,12 +1,5 @@
 config BR2_PACKAGE_ECRYPTFS_UTILS
 	bool "ecryptfs-utils"
-	select BR2_PACKAGE_KEYUTILS
-	select BR2_PACKAGE_LIBNSS
-	# runtime dependency only, some scripts are using the
-	# 'gettext' program to get translations
-	select BR2_PACKAGE_GETTEXT
-	# runtime dependency only
-	select BR2_PACKAGE_GETENT
 	depends on BR2_USE_WCHAR # gettext
 	depends on BR2_USE_MMU # keyutils
 	depends on !BR2_microblaze # keyutils
@@ -14,6 +7,13 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
 	depends on !BR2_MIPS_NABI32 # libnss
 	depends on !BR2_STATIC_LIBS # libnss, keyutils
+	select BR2_PACKAGE_KEYUTILS
+	select BR2_PACKAGE_LIBNSS
+	# runtime dependency only, some scripts are using the
+	# 'gettext' program to get translations
+	select BR2_PACKAGE_GETTEXT
+	# runtime dependency only
+	select BR2_PACKAGE_GETENT
 	help
 	  eCryptfs is a POSIX-compliant enterprise cryptographic
 	  filesystem for Linux. It is stacked on top of any other
diff --git a/package/efivar/Config.in b/package/efivar/Config.in
index 0ec8360..0fa9adf 100644
--- a/package/efivar/Config.in
+++ b/package/efivar/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
 	bool
+	default y
 	depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 \
 		|| BR2_powerpc64le || BR2_mipsel || BR2_mips64el
-	default y
 
 config BR2_PACKAGE_EFIVAR
 	bool "efivar"
diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in
index 7db8472..3228319 100644
--- a/package/elfutils/Config.in
+++ b/package/elfutils/Config.in
@@ -5,9 +5,6 @@ comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library"
 
 config BR2_PACKAGE_ELFUTILS
 	bool "elfutils"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS
 	# Only glibc and uClibc implement the myriad of required GNUisms
@@ -15,6 +12,9 @@ config BR2_PACKAGE_ELFUTILS
 	# build issue caused by the _ prefix used on blackfin for
 	# assembly symbols
 	depends on !BR2_bfin
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  Libraries/utilities to handle ELF objects (drop in
 	  replacement for libelf).
diff --git a/package/execline/Config.in b/package/execline/Config.in
index 556f9a5..7a2278f 100644
--- a/package/execline/Config.in
+++ b/package/execline/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_EXECLINE
 	bool "execline"
-	select BR2_PACKAGE_SKALIBS
 	depends on BR2_USE_MMU # skalibs
+	select BR2_PACKAGE_SKALIBS
 	help
 	  execline is a (non-interactive) scripting language, like sh;
 	  but its syntax is quite different from a traditional shell
diff --git a/package/exiv2/Config.in b/package/exiv2/Config.in
index 8ca95eb..a94e5cd 100644
--- a/package/exiv2/Config.in
+++ b/package/exiv2/Config.in
@@ -39,8 +39,8 @@ config BR2_PACKAGE_EXIV2_PNG
 
 config BR2_PACKAGE_EXIV2_XMP
 	bool "XMP support"
-	select BR2_PACKAGE_EXPAT
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_EXPAT
 	help
 	  Build with XMP support
 
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 05/25] fix ordering on configs starting with 'd'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter d in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter d.
  
 package/ding-libs/Config.in     | 2 +-
 package/directfb/Config.in      | 6 +++---
 package/docker-engine/Config.in | 2 +-
 package/dos2unix/Config.in      | 2 +-
 package/dovecot/Config.in       | 2 +-
 package/dropwatch/Config.in     | 4 ++--
 package/dvblast/Config.in       | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package/ding-libs/Config.in b/package/ding-libs/Config.in
index 7af75b7..d397f29 100644
--- a/package/ding-libs/Config.in
+++ b/package/ding-libs/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_DING_LIBS
 	bool "ding-libs"
+	depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT
 	help
 	  The ding-libs packages contain a set of libraries used by
 	  the System Security Services Daemon (SSSD) and other
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 6a3d718..e3b53e0 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -21,9 +21,9 @@ if BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_DIRECTFB_MULTI
 	bool "directfb multi application"
-	select BR2_PACKAGE_LINUX_FUSION
 	depends on BR2_USE_MMU # madvise()
 	depends on BR2_LINUX_KERNEL
+	select BR2_PACKAGE_LINUX_FUSION
 	help
 	  Enable use of multiple concurrent DirectFB applications
 
@@ -113,8 +113,8 @@ config BR2_PACKAGE_DIRECTFB_SERIALMOUSE
 
 config BR2_PACKAGE_DIRECTFB_TSLIB
 	bool "enable touchscreen support"
-	depends on !BR2_STATIC_LIBS # tslib
 	default y
+	depends on !BR2_STATIC_LIBS # tslib
 	select BR2_PACKAGE_TSLIB
 
 comment "touchscreen support needs a toolchain w/ dynamic library"
@@ -130,8 +130,8 @@ config BR2_PACKAGE_DIRECTFB_TIFF
 
 config BR2_PACKAGE_DIRECTFB_IMLIB2
 	bool "enable IMLIB2 support"
-	select BR2_PACKAGE_IMLIB2
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_IMLIB2
 
 comment "imlib2 support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 8cde4a4..caaf639 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -13,11 +13,11 @@ if BR2_PACKAGE_DOCKER_ENGINE
 
 config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
 	bool "docker daemon"
+	default y
 	depends on BR2_USE_MMU # docker-containerd
 	select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
 	select BR2_PACKAGE_IPTABLES # runtime dependency
 	select BR2_PACKAGE_SQLITE # runtime dependency
-	default y
 	help
 	  Build the Docker system daemon.
 	  If not selected, will build client only.
diff --git a/package/dos2unix/Config.in b/package/dos2unix/Config.in
index 0a4f5e2..6945f52 100644
--- a/package/dos2unix/Config.in
+++ b/package/dos2unix/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_DOS2UNIX
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	bool "dos2unix"
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  dos2unix converts text file line endings between CRLF and LF
 
diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in
index d1ff7bc..b93e09f 100644
--- a/package/dovecot/Config.in
+++ b/package/dovecot/Config.in
@@ -17,9 +17,9 @@ if BR2_PACKAGE_DOVECOT
 
 config BR2_PACKAGE_DOVECOT_MYSQL
 	bool "mysql support"
-	select BR2_PACKAGE_MYSQL
 	depends on BR2_INSTALL_LIBSTDCPP # mysql
 	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
+	select BR2_PACKAGE_MYSQL
 	help
 	  Enable MySQL support.
 
diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
index 6f04c85..127b698 100644
--- a/package/dropwatch/Config.in
+++ b/package/dropwatch/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_DROPWATCH
 	bool "dropwatch"
-	select BR2_PACKAGE_BINUTILS
 	depends on !BR2_nios2 # binutils
 	depends on BR2_USE_WCHAR # binutils
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
+	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_LIBNL
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	help
 	  Dropwatch is an interactive utility for monitoring and
 	  recording packets that are dropped by the kernel
diff --git a/package/dvblast/Config.in b/package/dvblast/Config.in
index b7f0c06..c358531 100644
--- a/package/dvblast/Config.in
+++ b/package/dvblast/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_DVBLAST
 	bool "dvblast"
+	depends on !BR2_bfin  # libev
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
 	select BR2_PACKAGE_BITSTREAM
 	select BR2_PACKAGE_LIBEV
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on !BR2_bfin  # libev
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
 	help
 	  DVBlast is a simple and powerful MPEG-2/TS demux and
 	  streaming application.
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 04/25] fix ordering on configs starting with 'c'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter c in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter c.
 package/cairomm/Config.in     |  6 +++---
 package/ccid/Config.in        |  4 ++--
 package/cdrkit/Config.in      |  4 ++--
 package/checkpolicy/Config.in |  4 ++--
 package/clamav/Config.in      |  4 ++--
 package/classpath/Config.in   |  2 +-
 package/cmake/Config.in       | 14 +++++++-------
 package/connman/Config.in     |  8 ++++----
 package/cpio/Config.in        |  2 +-
 package/cppcms/Config.in      |  6 +++---
 package/curlftpfs/Config.in   |  8 ++++----
 package/czmq/Config.in        |  2 +-
 12 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in
index c0d5ccd..840549b 100644
--- a/package/cairomm/Config.in
+++ b/package/cairomm/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_CAIROMM
 	bool "cairomm"
-	select BR2_PACKAGE_CAIRO
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_LIBSIGC
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBSIGC
 	help
 	  The cairomm package is a set of C++ bindings for Cairo.
 
diff --git a/package/ccid/Config.in b/package/ccid/Config.in
index f5bb583..dfb57e8 100644
--- a/package/ccid/Config.in
+++ b/package/ccid/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_CCID
 	bool "ccid"
-	select BR2_PACKAGE_PCSC_LITE
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	depends on BR2_USE_MMU # pcsc-lite
 	depends on !BR2_STATIC_LIBS # pcsc-lite
+	select BR2_PACKAGE_PCSC_LITE
+	select BR2_PACKAGE_LIBUSB
 	help
 	  PC/SC driver for USB CCID smart card readers
 
diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in
index af18ba9..c5f43f2 100644
--- a/package/cdrkit/Config.in
+++ b/package/cdrkit/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_CDRKIT
+	bool "cdrkit"
 	# Needed for libbz
+	depends on BR2_USE_MMU # fork
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_LIBCAP
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_USE_MMU # fork
-	bool "cdrkit"
 	help
 	  cdrkit is a suite of programs for recording CDs and DVDs,
 	  blanking CD-RW media, creating ISO-9660 filesystem images,
diff --git a/package/checkpolicy/Config.in b/package/checkpolicy/Config.in
index 99754ce..97ad0b7 100644
--- a/package/checkpolicy/Config.in
+++ b/package/checkpolicy/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_CHECKPOLICY
 	bool "checkpolicy"
-	select BR2_PACKAGE_LIBSELINUX
-	select BR2_PACKAGE_FLEX
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
 	depends on !BR2_STATIC_LIBS # libselinux
 	depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
 	depends on !BR2_arc # libselinux
+	select BR2_PACKAGE_LIBSELINUX
+	select BR2_PACKAGE_FLEX
 	help
 	  checkpolicy is the SELinux policy compiler. It uses libsepol
 	  to generate the binary policy. checkpolicy uses the static
diff --git a/package/clamav/Config.in b/package/clamav/Config.in
index f832341..051df0d 100644
--- a/package/clamav/Config.in
+++ b/package/clamav/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_CLAMAV
 	bool "clamav"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBTOOL
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
 	help
 	  ClamAV is an open source antivirus engine for detecting trojans,
 	  viruses, malware & other malicious threats.
diff --git a/package/classpath/Config.in b/package/classpath/Config.in
index 8051523..0385ccd 100644
--- a/package/classpath/Config.in
+++ b/package/classpath/Config.in
@@ -7,9 +7,9 @@ config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 
 config BR2_PACKAGE_CLASSPATH
 	bool "classpath"
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	select BR2_NEEDS_HOST_JAR
 	select BR2_NEEDS_HOST_JAVAC
-	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU
 	  project to create free core class libraries for use with
diff --git a/package/cmake/Config.in b/package/cmake/Config.in
index 2706db5..1c95d71 100644
--- a/package/cmake/Config.in
+++ b/package/cmake/Config.in
@@ -12,6 +12,13 @@ config BR2_PACKAGE_CMAKE
 
 config BR2_PACKAGE_CMAKE_CTEST
 	bool "ctest"
+	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
+	depends on BR2_USE_WCHAR # libarchive
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
+	depends on BR2_USE_MMU # libuv
 	select BR2_PACKAGE_CMAKE
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_JSONCPP
@@ -21,13 +28,6 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
 	select BR2_PACKAGE_LIBUV
-	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
-	depends on BR2_USE_WCHAR # libarchive
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
-	depends on BR2_USE_MMU # libuv
 	help
 	  CTest is a testing tool distributed as a part of CMake. It
 	  can be used to automate updating (using CVS for example),
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 6ed40be..39a81ee 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -1,14 +1,14 @@
 config BR2_PACKAGE_CONNMAN
 	bool "connman"
-	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_IPTABLES
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus, libglib2
 	depends on !BR2_STATIC_LIBS # needs dlopen()
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_USES_MUSL # mixes userspace and kernel headers
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_IPTABLES
 	help
 	  The Connection Manager (ConnMan) project provides a daemon
 	  for managing internet connections within embedded devices
@@ -50,8 +50,8 @@ config BR2_PACKAGE_CONNMAN_LOOPBACK
 
 config BR2_PACKAGE_CONNMAN_NEARD
 	bool "enable neard support"
-	select BR2_PACKAGE_NEARD
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # neard
+	select BR2_PACKAGE_NEARD
 
 config BR2_PACKAGE_CONNMAN_OFONO
 	bool "enable ofono support"
diff --git a/package/cpio/Config.in b/package/cpio/Config.in
index 1210a0b..3ef0402 100644
--- a/package/cpio/Config.in
+++ b/package/cpio/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_CPIO
 	bool "cpio"
+	depends on BR2_USE_WCHAR
 	# Need argp.h support
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
-	depends on BR2_USE_WCHAR
 	help
 	  cpio archive utility for creation and extraction.
 
diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in
index 2cf7005..e930c04 100644
--- a/package/cppcms/Config.in
+++ b/package/cppcms/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_CPPCMS
 	bool "cppcms"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_PCRE
-	select BR2_PACKAGE_LIBGCRYPT
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_LIBGCRYPT
 	help
 	  CppCMS is a Free High Performance Web Development Framework
 	  (not a CMS) aimed for Rapid Web Application Development. It
diff --git a/package/curlftpfs/Config.in b/package/curlftpfs/Config.in
index ad3ac24..c2d591a 100644
--- a/package/curlftpfs/Config.in
+++ b/package/curlftpfs/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_CURLFTPFS
 	bool "curlftpfs (FUSE)"
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
+	depends on BR2_USE_MMU # libfuse, glib2
+	depends on !BR2_STATIC_LIBS # libfuse
 	select BR2_PACKAGE_LIBFUSE
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBCURL
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
-	depends on BR2_USE_MMU # libfuse, glib2
-	depends on !BR2_STATIC_LIBS # libfuse
 	help
 	  CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE
 	  and libcurl.
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index cfa5152..71389fc 100644
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_CZMQ
 	bool "czmq"
-	select BR2_PACKAGE_ZEROMQ
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
+	select BR2_PACKAGE_ZEROMQ
 	help
 	  High-level C Binding for 0MQ
 
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 03/25] fix ordering on configs starting with 'b'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter b in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter b.
 package/bandwidthd/Config.in    | 2 +-
 package/bash/Config.in          | 4 ++--
 package/binutils/Config.in      | 2 +-
 package/binutils/Config.in.host | 2 +-
 package/bluez5_utils/Config.in  | 2 +-
 package/boost/Config.in         | 4 ++--
 package/bustle/Config.in        | 4 ++--
 package/busybox/Config.in       | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package/bandwidthd/Config.in b/package/bandwidthd/Config.in
index b4a47f2..a503da4 100644
--- a/package/bandwidthd/Config.in
+++ b/package/bandwidthd/Config.in
@@ -32,8 +32,8 @@ if BR2_PACKAGE_BANDWIDTHD
 
 config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
 	bool "enable postgresql log target support"
-	select BR2_PACKAGE_POSTGRESQL
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_POSTGRESQL
 	help
 	  Enable support for logging the bandwidthd data to a remote
 	  (or local) postgresql server. This data can then be viewed
diff --git a/package/bash/Config.in b/package/bash/Config.in
index 783e4b3..5a9ebb8 100644
--- a/package/bash/Config.in
+++ b/package/bash/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_BASH
 	bool "bash"
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
 	# uses fork()
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
 	help
 	  The standard GNU Bourne again shell.
 
diff --git a/package/binutils/Config.in b/package/binutils/Config.in
index fdfdfe9..360dd5e 100644
--- a/package/binutils/Config.in
+++ b/package/binutils/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_BINUTILS
 	bool "binutils"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on !BR2_nios2
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Install binutils on the target
 
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index cca71fb..aa24fd7 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -2,8 +2,8 @@ comment "Binutils Options"
 
 choice
 	prompt "Binutils Version"
-	depends on !BR2_arc
 	default BR2_BINUTILS_VERSION_2_27_X
+	depends on !BR2_arc
 	help
 	  Select the version of binutils you wish to use.
 
diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
index a7c0ee4..3611c69 100644
--- a/package/bluez5_utils/Config.in
+++ b/package/bluez5_utils/Config.in
@@ -29,8 +29,8 @@ if BR2_PACKAGE_BLUEZ5_UTILS
 
 config BR2_PACKAGE_BLUEZ5_UTILS_OBEX
 	bool "build OBEX support"
-	select BR2_PACKAGE_LIBICAL
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBICAL
 	help
 	  Enable the OBEX support in Bluez 5.x.
 
diff --git a/package/boost/Config.in b/package/boost/Config.in
index 403bbf3..9825c09 100644
--- a/package/boost/Config.in
+++ b/package/boost/Config.in
@@ -115,9 +115,9 @@ config BR2_PACKAGE_BOOST_MATH
 	bool "boost-math"
 
 config BR2_PACKAGE_BOOST_METAPARSE
+	bool "boost-metaparse"
 	depends on BR2_USE_MMU # boost-test
 	select BR2_PACKAGE_BOOST_TEST
-	bool "boost-metaparse"
 
 config BR2_PACKAGE_BOOST_MPI
 	bool "boost-mpi"
@@ -126,8 +126,8 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
 	bool "boost-program_options"
 
 config BR2_PACKAGE_BOOST_PYTHON
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	bool "boost-python"
+	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 
 config BR2_PACKAGE_BOOST_RANDOM
 	bool "boost-random"
diff --git a/package/bustle/Config.in b/package/bustle/Config.in
index f213da5..109ebde 100644
--- a/package/bustle/Config.in
+++ b/package/bustle/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_BUSTLE
 	bool "bustle"
-	select BR2_PACKAGE_LIBPCAP
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_PACKAGE_DBUS # runtime
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Bustle is a better dbus-monitor! It records and draws
 	  sequence diagrams of D-Bus activity, showing signal
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 504cd8a..7eb7eb9 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -35,12 +35,12 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	  by busybox.
 
 config BR2_PACKAGE_BUSYBOX_SELINUX
-	select BR2_PACKAGE_LIBSELINUX
+	bool "Enable SELinux support"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on !BR2_arc
-	bool "Enable SELinux support"
+	select BR2_PACKAGE_LIBSELINUX
 	help
 	  Enable SELinux support in BusyBox. Please note that
 	  depending on your BusyBox configuration and the SELinux
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 02/25] fix ordering on configs starting with 'a'
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422171811.1346-1-Adamduskett@outlook.com>

The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter a in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - Broke package up into just packages starting with the letter a.
  
 package/agentpp/Config.in       |  2 +-
 package/aircrack-ng/Config.in   |  2 +-
 package/alsa-lib/Config.in      | 10 +++++-----
 package/alsa-utils/Config.in    |  4 ++--
 package/alsamixergui/Config.in  |  4 ++--
 package/android-tools/Config.in |  4 ++--
 package/apache/Config.in        |  4 ++--
 package/apr-util/Config.in      |  4 ++--
 package/atk/Config.in           |  2 +-
 package/atkmm/Config.in         |  6 +++---
 package/avrdude/Config.in       |  8 ++++----
 package/axel/Config.in          |  2 +-
 12 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/package/agentpp/Config.in b/package/agentpp/Config.in
index 4b70a1a..e591fb5 100644
--- a/package/agentpp/Config.in
+++ b/package/agentpp/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_AGENTPP
 	bool "agent++"
-	select BR2_PACKAGE_SNMPPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # snmp++
 	depends on !BR2_STATIC_LIBS # snmp++
+	select BR2_PACKAGE_SNMPPP
 	help
 	  AGENT++ is a set of C++ classes which provides a complete protocol
 	  engine and dispatch table for the development of SNMP agents.
diff --git a/package/aircrack-ng/Config.in b/package/aircrack-ng/Config.in
index 00ce4e4..b6572dc 100644
--- a/package/aircrack-ng/Config.in
+++ b/package/aircrack-ng/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_AIRCRACK_NG
 	bool "aircrack-ng"
 	depends on BR2_USE_MMU # uses fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# libnl has issues when linking statically
 	# they need fixing in libnl itself
 	select BR2_PACKAGE_LIBNL if !BR2_STATIC_LIBS
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  A set of tools for auditing wireless networks
 
diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in
index 97e8489..c355b2c 100644
--- a/package/alsa-lib/Config.in
+++ b/package/alsa-lib/Config.in
@@ -3,15 +3,15 @@ comment "alsa-lib needs a toolchain w/ threads"
 
 menuconfig BR2_PACKAGE_ALSA_LIB
 	bool "alsa-lib"
-	# Temporary until
-	# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
-	# is fixed
-	select BR2_PACKAGE_ALSA_LIB_PCM
 	# Even though some parts of alsa-lib use threads only when
 	# available, some PCM plugins use them unconditionally. Since
 	# the usage of alsa-lib on no-thread systems is pretty
 	# unlikely, just require thread support globally for alsa-lib.
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# Temporary until
+	# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
+	# is fixed
+	select BR2_PACKAGE_ALSA_LIB_PCM
 	help
 	  The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
 	  functionality to the Linux operating system.
@@ -68,8 +68,8 @@ config BR2_PACKAGE_ALSA_LIB_SEQ
 
 config BR2_PACKAGE_ALSA_LIB_ALISP
 	bool "alisp"
-	depends on BR2_USE_MMU
 	default y
+	depends on BR2_USE_MMU
 
 config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS
 	bool "old-symbols"
diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in
index adc0aab..1d42f2e 100644
--- a/package/alsa-utils/Config.in
+++ b/package/alsa-utils/Config.in
@@ -33,10 +33,10 @@ config BR2_PACKAGE_ALSA_UTILS_ALSALOOP
 
 config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
 	bool "alsamixer"
+	default y
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_ALSA_LIB_MIXER
-	depends on BR2_USE_WCHAR
-	default y
 
 comment "alsamixer needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
index 5b61f38..2016a28 100644
--- a/package/alsamixergui/Config.in
+++ b/package/alsamixergui/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_ALSAMIXERGUI
+	bool "alsamixergui"
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # fltk fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	select BR2_PACKAGE_FLTK
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_PCM
 	select BR2_PACKAGE_ALSA_LIB_MIXER
-	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
-	bool "alsamixergui"
 	help
 	  A nice GUI mixer for Alsa using fltk
 
diff --git a/package/android-tools/Config.in b/package/android-tools/Config.in
index 19772ad..96e36e6 100644
--- a/package/android-tools/Config.in
+++ b/package/android-tools/Config.in
@@ -34,13 +34,13 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
 
 config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT
 	bool "fastboot"
-	select BR2_PACKAGE_LIBSELINUX
-	select BR2_PACKAGE_ZLIB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
 	depends on !BR2_STATIC_LIBS # libselinux
 	depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
 	depends on !BR2_arc # libselinux
 	depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
+	select BR2_PACKAGE_LIBSELINUX
+	select BR2_PACKAGE_ZLIB
 	help
 	  This option will build and install the fastboot utility for
 	  the target, which can be used to reflash other target devices
diff --git a/package/apache/Config.in b/package/apache/Config.in
index 511876d..5916d30 100644
--- a/package/apache/Config.in
+++ b/package/apache/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_APACHE
 	bool "apache"
-	select BR2_PACKAGE_APR_UTIL
-	select BR2_PACKAGE_PCRE
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # apr
+	select BR2_PACKAGE_APR_UTIL
+	select BR2_PACKAGE_PCRE
 	help
 	  The Apache HTTP Server Project is an effort to develop and maintain an
 	  open-source HTTP server for modern operating systems including UNIX
diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in
index 1d7db2b..6c5e3bb 100644
--- a/package/apr-util/Config.in
+++ b/package/apr-util/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_APR_UTIL
 	bool "apr-util"
-	select BR2_PACKAGE_APR
-	select BR2_PACKAGE_EXPAT
 	# apr really needs shared library support
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_MMU # apr
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_EXPAT
 	help
 	  The utility library for the apache runtime project
 
diff --git a/package/atk/Config.in b/package/atk/Config.in
index 1120a94..c980614 100644
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_ATK
 	bool "atk"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.
 
diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in
index 2091eab..edc8383 100644
--- a/package/atkmm/Config.in
+++ b/package/atkmm/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_ATKMM
 	bool "atkmm"
-	select BR2_PACKAGE_ATK
-	select BR2_PACKAGE_GLIBMM
-	select BR2_PACKAGE_LIBSIGC
 	depends on BR2_INSTALL_LIBSTDCPP # glibmm
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2
 	depends on BR2_USE_MMU # atk/glibmm -> libglib2
 	depends on BR2_USE_WCHAR # atk/glibmm -> libglib2
+	select BR2_PACKAGE_ATK
+	select BR2_PACKAGE_GLIBMM
+	select BR2_PACKAGE_LIBSIGC
 
 	help
 	  The atkmm package is a set of C++ bindings for Atk.
diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in
index 8aca841..3757f17 100644
--- a/package/avrdude/Config.in
+++ b/package/avrdude/Config.in
@@ -1,14 +1,14 @@
 config BR2_PACKAGE_AVRDUDE
 	bool "avrdude"
-	select BR2_PACKAGE_ELFUTILS
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	select BR2_PACKAGE_NCURSES
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
 	depends on !BR2_bfin # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
+	select BR2_PACKAGE_ELFUTILS
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
+	select BR2_PACKAGE_NCURSES
 	help
 	  avrdude is a programmer for Atmel AVR microcontrollers
 	  this package provides a version with new linuxspi driver
diff --git a/package/axel/Config.in b/package/axel/Config.in
index aa93f2a..aea85bf 100644
--- a/package/axel/Config.in
+++ b/package/axel/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_AXEL
 	bool "axel"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  HTTP/FTP download accelerator.
 
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH v2 01/25] package configs: clean up indentation warnings
From: Adam Duskett @ 2017-04-22 17:17 UTC (permalink / raw)
  To: buildroot

The check-package script when ran gave warnings on indentation issues
on all of these Config files.  This patch cleans up all warnings
related to the indentation of the Config files in the package directory

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
v1 -> v2:
  - No changes.
  
 package/b43-firmware/Config.in       |   8 +-
 package/binutils/Config.in.host      |  12 +-
 package/gcc/Config.in.host           | 156 +++++------
 package/gdb/Config.in.host           |  12 +-
 package/jquery-ui-themes/Config.in   |  96 +++----
 package/kodi/Config.in               | 100 +++----
 package/linux-headers/Config.in.host |  85 +++---
 package/lua/Config.in                |  12 +-
 package/uclibc/Config.in             |  28 +-
 package/x11r7/Config.in              | 526 ++++++++++++++++++-----------------
 10 files changed, 522 insertions(+), 513 deletions(-)

diff --git a/package/b43-firmware/Config.in b/package/b43-firmware/Config.in
index bc69bbc..7cef023 100644
--- a/package/b43-firmware/Config.in
+++ b/package/b43-firmware/Config.in
@@ -14,11 +14,11 @@ choice
 	  kernel >= 3.2 need a different firmware than the b43 drivers
 	  from kernel < 3.2.
 
-	config BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2
-		bool ">= 3.2"
+config BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2
+	bool ">= 3.2"
 
-	config BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2
-		bool "< 3.2"
+config BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2
+	bool "< 3.2"
 
 endchoice
 
diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host
index 308322a..cca71fb 100644
--- a/package/binutils/Config.in.host
+++ b/package/binutils/Config.in.host
@@ -7,14 +7,14 @@ choice
 	help
 	  Select the version of binutils you wish to use.
 
-	config BR2_BINUTILS_VERSION_2_26_X
-		bool "binutils 2.26.1"
+config BR2_BINUTILS_VERSION_2_26_X
+	bool "binutils 2.26.1"
 
-	config BR2_BINUTILS_VERSION_2_27_X
-		bool "binutils 2.27"
+config BR2_BINUTILS_VERSION_2_27_X
+	bool "binutils 2.27"
 
-	config BR2_BINUTILS_VERSION_2_28_X
-		bool "binutils 2.28"
+config BR2_BINUTILS_VERSION_2_28_X
+	bool "binutils 2.28"
 
 endchoice
 
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host
index 9cf4571..4bcb23e 100644
--- a/package/gcc/Config.in.host
+++ b/package/gcc/Config.in.host
@@ -8,84 +8,84 @@ choice
 	help
 	  Select the version of gcc you wish to use.
 
-	config BR2_GCC_VERSION_4_8_X
-		bool "gcc 4.8.x"
-		# Broken or unsupported architectures
-		depends on !BR2_microblaze && !BR2_arc && !BR2_or1k \
-			&& !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin
-		# Broken or unsupported ARM cores
-		depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8
-		# Broken or unsupported PPC cores
-		depends on !BR2_powerpc_power8
-		# Unsupported MIPS cores
-		depends on !BR2_mips_interaptiv
-		# gcc-4.8.x + binutils-2.25 is broken for MIPS
-		depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X)
-		# Unsupported for MIPS R5
-		depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5
-		# Unsupported for MIPS R6
-		depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
-		# musl ppc64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
-		# musl mips64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
-
-	config BR2_GCC_VERSION_ARC
-		bool "gcc arc (6.x)"
-		# Only supported architecture
-		depends on BR2_arc
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
-
-	config BR2_GCC_VERSION_OR1K
-		bool "gcc or1k (5.x)"
-		# Only supported architecture
-		depends on BR2_or1k
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_5
-
-	config BR2_GCC_VERSION_4_9_X
-		bool "gcc 4.9.x"
-		# Broken or unsupported architectures
-		depends on !BR2_arc && !BR2_bfin && !BR2_or1k
-		# Broken or unsupported ARM cores
-		depends on !BR2_cortex_a17 && !BR2_cortex_a72
-		# Unsupported MIPS cores
-		depends on !BR2_mips_interaptiv
-		# Unsupported for MIPS R5
-		depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5
-		# Unsupported for MIPS R6
-		depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
-		# musl microblaze unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe))
-		# musl ppc64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
-		# musl mips64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		# PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-
-	config BR2_GCC_VERSION_5_X
-		bool "gcc 5.x"
-		# Broken or unsupported architectures
-		depends on !BR2_arc && !BR2_bfin && !BR2_or1k
-		# musl ppc64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
-		# Unsupported MIPS cores
-		depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && \
-			!BR2_mips_m6250 && !BR2_mips_i6400 && !BR2_mips_p6600
-		# musl mips64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_5
-
-	config BR2_GCC_VERSION_6_X
-		bool "gcc 6.x"
-		# Broken or unsupported architectures
-		depends on !BR2_arc
-		depends on !BR2_microblaze
-		depends on !BR2_or1k
-		# Unsupported MIPS cores
-		depends on !BR2_mips_m6250 && !BR2_mips_p6600
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+config BR2_GCC_VERSION_4_8_X
+	bool "gcc 4.8.x"
+	# Broken or unsupported architectures
+	depends on !BR2_microblaze && !BR2_arc && !BR2_or1k \
+		&& !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin
+	# Broken or unsupported ARM cores
+	depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8
+	# Broken or unsupported PPC cores
+	depends on !BR2_powerpc_power8
+	# Unsupported MIPS cores
+	depends on !BR2_mips_interaptiv
+	# gcc-4.8.x + binutils-2.25 is broken for MIPS
+	depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X)
+	# Unsupported for MIPS R5
+	depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5
+	# Unsupported for MIPS R6
+	depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
+	# musl ppc64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
+	# musl mips64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
+config BR2_GCC_VERSION_ARC
+	bool "gcc arc (6.x)"
+	# Only supported architecture
+	depends on BR2_arc
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+
+config BR2_GCC_VERSION_OR1K
+	bool "gcc or1k (5.x)"
+	# Only supported architecture
+	depends on BR2_or1k
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
+
+config BR2_GCC_VERSION_4_9_X
+	bool "gcc 4.9.x"
+	# Broken or unsupported architectures
+	depends on !BR2_arc && !BR2_bfin && !BR2_or1k
+	# Broken or unsupported ARM cores
+	depends on !BR2_cortex_a17 && !BR2_cortex_a72
+	# Unsupported MIPS cores
+	depends on !BR2_mips_interaptiv
+	# Unsupported for MIPS R5
+	depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5
+	# Unsupported for MIPS R6
+	depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
+	# musl microblaze unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe))
+	# musl ppc64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
+	# musl mips64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
+	# PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+config BR2_GCC_VERSION_5_X
+	bool "gcc 5.x"
+	# Broken or unsupported architectures
+	depends on !BR2_arc && !BR2_bfin && !BR2_or1k
+	# musl ppc64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
+	# Unsupported MIPS cores
+	depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && \
+		!BR2_mips_m6250 && !BR2_mips_i6400 && !BR2_mips_p6600
+	# musl mips64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
+
+config BR2_GCC_VERSION_6_X
+	bool "gcc 6.x"
+	# Broken or unsupported architectures
+	depends on !BR2_arc
+	depends on !BR2_microblaze
+	depends on !BR2_or1k
+	# Unsupported MIPS cores
+	depends on !BR2_mips_m6250 && !BR2_mips_p6600
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
 endchoice
 
diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host
index cbb157e..a059fdc 100644
--- a/package/gdb/Config.in.host
+++ b/package/gdb/Config.in.host
@@ -39,14 +39,14 @@ choice
 	help
 	  Select the version of gdb you wish to use.
 
-	config BR2_GDB_VERSION_7_10
-		bool "gdb 7.10.x"
+config BR2_GDB_VERSION_7_10
+	bool "gdb 7.10.x"
 
-	config BR2_GDB_VERSION_7_11
-		bool "gdb 7.11.x"
+config BR2_GDB_VERSION_7_11
+	bool "gdb 7.11.x"
 
-	config BR2_GDB_VERSION_7_12
-		bool "gdb 7.12.x"
+config BR2_GDB_VERSION_7_12
+	bool "gdb 7.12.x"
 
 endchoice
 
diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in
index a7ae11e..fde3014 100644
--- a/package/jquery-ui-themes/Config.in
+++ b/package/jquery-ui-themes/Config.in
@@ -13,77 +13,77 @@ choice
 	help
 	  Specify the jQuery UI theme to install.
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
-		bool "black-tie"
+config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+	bool "black-tie"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
-		bool "blitzer"
+config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+	bool "blitzer"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
-		bool "cupertino"
+config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+	bool "cupertino"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
-		bool "dark-hive"
+config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+	bool "dark-hive"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
-		bool "dot-luv"
+config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+	bool "dot-luv"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
-		bool "eggplant"
+config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+	bool "eggplant"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
-		bool "excite-bike"
+config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+	bool "excite-bike"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
-		bool "flick"
+config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+	bool "flick"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
-		bool "hot-sneaks"
+config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+	bool "hot-sneaks"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
-		bool "humanity"
+config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+	bool "humanity"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
-		bool "le-frog"
+config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+	bool "le-frog"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
-		bool "mint-choc"
+config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+	bool "mint-choc"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
-		bool "overcast"
+config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+	bool "overcast"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
-		bool "pepper-grinder"
+config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+	bool "pepper-grinder"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
-		bool "redmond"
+config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+	bool "redmond"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
-		bool "smoothness"
+config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+	bool "smoothness"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
-		bool "south-street"
+config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+	bool "south-street"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_START
-		bool "start"
+config BR2_PACKAGE_JQUERY_UI_THEME_START
+	bool "start"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
-		bool "sunny"
+config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+	bool "sunny"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
-		bool "swanky-purse"
+config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+	bool "swanky-purse"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
-		bool "trontastic"
+config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+	bool "trontastic"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
-		bool "ui-darkness"
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+	bool "ui-darkness"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
-		bool "ui-lightness"
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+	bool "ui-lightness"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_VADER
-		bool "vader"
+config BR2_PACKAGE_JQUERY_UI_THEME_VADER
+	bool "vader"
 
 endchoice
 
diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index f2a3e2e..5b1b424 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -256,71 +256,71 @@ config BR2_PACKAGE_KODI_OPTICALDRIVE
 	bool
 
 menu "Audio decoder addons"
-	source "package/kodi-audiodecoder-modplug/Config.in"
-	source "package/kodi-audiodecoder-nosefart/Config.in"
-	source "package/kodi-audiodecoder-opus/Config.in"
-	source "package/kodi-audiodecoder-sidplay/Config.in"
-	source "package/kodi-audiodecoder-snesapu/Config.in"
-	source "package/kodi-audiodecoder-stsound/Config.in"
-	source "package/kodi-audiodecoder-timidity/Config.in"
-	source "package/kodi-audiodecoder-vgmstream/Config.in"
+source "package/kodi-audiodecoder-modplug/Config.in"
+source "package/kodi-audiodecoder-nosefart/Config.in"
+source "package/kodi-audiodecoder-opus/Config.in"
+source "package/kodi-audiodecoder-sidplay/Config.in"
+source "package/kodi-audiodecoder-snesapu/Config.in"
+source "package/kodi-audiodecoder-stsound/Config.in"
+source "package/kodi-audiodecoder-timidity/Config.in"
+source "package/kodi-audiodecoder-vgmstream/Config.in"
 endmenu
 
 menu "Audio DSP addons"
-	source "package/kodi-adsp-basic/Config.in"
-	source "package/kodi-adsp-freesurround/Config.in"
+source "package/kodi-adsp-basic/Config.in"
+source "package/kodi-adsp-freesurround/Config.in"
 endmenu
 
 menu "Audio encoder addons"
-	source "package/kodi-audioencoder-flac/Config.in"
-	source "package/kodi-audioencoder-lame/Config.in"
-	source "package/kodi-audioencoder-vorbis/Config.in"
-	source "package/kodi-audioencoder-wav/Config.in"
+source "package/kodi-audioencoder-flac/Config.in"
+source "package/kodi-audioencoder-lame/Config.in"
+source "package/kodi-audioencoder-vorbis/Config.in"
+source "package/kodi-audioencoder-wav/Config.in"
 endmenu
 
 menu "PVR addons"
-	source "package/kodi-pvr-argustv/Config.in"
-	source "package/kodi-pvr-dvblink/Config.in"
-	source "package/kodi-pvr-dvbviewer/Config.in"
-	source "package/kodi-pvr-filmon/Config.in"
-	source "package/kodi-pvr-hdhomerun/Config.in"
-	source "package/kodi-pvr-hts/Config.in"
-	source "package/kodi-pvr-iptvsimple/Config.in"
-	source "package/kodi-pvr-mediaportal-tvserver/Config.in"
-	source "package/kodi-pvr-mythtv/Config.in"
-	source "package/kodi-pvr-nextpvr/Config.in"
-	source "package/kodi-pvr-njoy/Config.in"
-	source "package/kodi-pvr-pctv/Config.in"
-	source "package/kodi-pvr-stalker/Config.in"
-	source "package/kodi-pvr-vbox/Config.in"
-	source "package/kodi-pvr-vdr-vnsi/Config.in"
-	source "package/kodi-pvr-vuplus/Config.in"
-	source "package/kodi-pvr-wmc/Config.in"
+source "package/kodi-pvr-argustv/Config.in"
+source "package/kodi-pvr-dvblink/Config.in"
+source "package/kodi-pvr-dvbviewer/Config.in"
+source "package/kodi-pvr-filmon/Config.in"
+source "package/kodi-pvr-hdhomerun/Config.in"
+source "package/kodi-pvr-hts/Config.in"
+source "package/kodi-pvr-iptvsimple/Config.in"
+source "package/kodi-pvr-mediaportal-tvserver/Config.in"
+source "package/kodi-pvr-mythtv/Config.in"
+source "package/kodi-pvr-nextpvr/Config.in"
+source "package/kodi-pvr-njoy/Config.in"
+source "package/kodi-pvr-pctv/Config.in"
+source "package/kodi-pvr-stalker/Config.in"
+source "package/kodi-pvr-vbox/Config.in"
+source "package/kodi-pvr-vdr-vnsi/Config.in"
+source "package/kodi-pvr-vuplus/Config.in"
+source "package/kodi-pvr-wmc/Config.in"
 endmenu
 
 menu "Screensavers"
-	source "package/kodi-screensaver-asteroids/Config.in"
-	source "package/kodi-screensaver-asterwave/Config.in"
-	source "package/kodi-screensaver-biogenesis/Config.in"
-	source "package/kodi-screensaver-cpblobs/Config.in"
-	source "package/kodi-screensaver-crystalmorph/Config.in"
-	source "package/kodi-screensaver-greynetic/Config.in"
-	source "package/kodi-screensaver-matrixtrails/Config.in"
-	source "package/kodi-screensaver-pingpong/Config.in"
-	source "package/kodi-screensaver-planestate/Config.in"
-	source "package/kodi-screensaver-pyro/Config.in"
-	source "package/kodi-screensaver-rsxs/Config.in"
-	source "package/kodi-screensaver-stars/Config.in"
+source "package/kodi-screensaver-asteroids/Config.in"
+source "package/kodi-screensaver-asterwave/Config.in"
+source "package/kodi-screensaver-biogenesis/Config.in"
+source "package/kodi-screensaver-cpblobs/Config.in"
+source "package/kodi-screensaver-crystalmorph/Config.in"
+source "package/kodi-screensaver-greynetic/Config.in"
+source "package/kodi-screensaver-matrixtrails/Config.in"
+source "package/kodi-screensaver-pingpong/Config.in"
+source "package/kodi-screensaver-planestate/Config.in"
+source "package/kodi-screensaver-pyro/Config.in"
+source "package/kodi-screensaver-rsxs/Config.in"
+source "package/kodi-screensaver-stars/Config.in"
 endmenu
 
 menu "Visualisations"
-	source "package/kodi-visualisation-fishbmc/Config.in"
-	source "package/kodi-visualisation-fountain/Config.in"
-	source "package/kodi-visualisation-goom/Config.in"
-	source "package/kodi-visualisation-shadertoy/Config.in"
-	source "package/kodi-visualisation-spectrum/Config.in"
-	source "package/kodi-visualisation-waveforhue/Config.in"
-	source "package/kodi-visualisation-waveform/Config.in"
+source "package/kodi-visualisation-fishbmc/Config.in"
+source "package/kodi-visualisation-fountain/Config.in"
+source "package/kodi-visualisation-goom/Config.in"
+source "package/kodi-visualisation-shadertoy/Config.in"
+source "package/kodi-visualisation-spectrum/Config.in"
+source "package/kodi-visualisation-waveforhue/Config.in"
+source "package/kodi-visualisation-waveform/Config.in"
 endmenu
 
 endif # BR2_PACKAGE_KODI
diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 7a62442..7bfa5d4 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -22,48 +22,49 @@ choice
 	  or hide packages that have strong requirements on the kernel
 	  headers.
 
-	config BR2_KERNEL_HEADERS_AS_KERNEL
-		bool "Same as kernel being built"
-		depends on BR2_LINUX_KERNEL
-
-	config BR2_KERNEL_HEADERS_3_2
-		bool "Linux 3.2.x kernel headers"
-		depends on !BR2_arc && !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
-
-	config BR2_KERNEL_HEADERS_3_4
-		bool "Linux 3.4.x kernel headers"
-		depends on !BR2_arc && !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
-
-	config BR2_KERNEL_HEADERS_3_10
-		bool "Linux 3.10.x kernel headers"
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
-
-	config BR2_KERNEL_HEADERS_3_12
-		bool "Linux 3.12.x kernel headers"
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
-
-	config BR2_KERNEL_HEADERS_4_1
-		bool "Linux 4.1.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
-
-	config BR2_KERNEL_HEADERS_4_4
-		bool "Linux 4.4.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
-
-	config BR2_KERNEL_HEADERS_4_9
-		bool "Linux 4.9.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
-
-	config BR2_KERNEL_HEADERS_4_10
-		bool "Linux 4.10.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
-
-	config BR2_KERNEL_HEADERS_VERSION
-		bool "Manually specified Linux version"
+config BR2_KERNEL_HEADERS_AS_KERNEL
+	bool "Same as kernel being built"
+	depends on BR2_LINUX_KERNEL
+
+config BR2_KERNEL_HEADERS_3_2
+	bool "Linux 3.2.x kernel headers"
+	depends on !BR2_arc && !BR2_nios2
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+
+config BR2_KERNEL_HEADERS_3_4
+	bool "Linux 3.4.x kernel headers"
+	depends on !BR2_arc && !BR2_nios2
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+
+config BR2_KERNEL_HEADERS_3_10
+	bool "Linux 3.10.x kernel headers"
+	depends on !BR2_nios2
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+
+config BR2_KERNEL_HEADERS_3_12
+	bool "Linux 3.12.x kernel headers"
+	depends on !BR2_nios2
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+
+config BR2_KERNEL_HEADERS_4_1
+	bool "Linux 4.1.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
+
+config BR2_KERNEL_HEADERS_4_4
+	bool "Linux 4.4.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
+
+config BR2_KERNEL_HEADERS_4_9
+	bool "Linux 4.9.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
+
+config BR2_KERNEL_HEADERS_4_10
+	bool "Linux 4.10.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+
+config BR2_KERNEL_HEADERS_VERSION
+	bool "Manually specified Linux version"
+
 endchoice
 
 config BR2_DEFAULT_KERNEL_VERSION
diff --git a/package/lua/Config.in b/package/lua/Config.in
index 711fa89..35910cb 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -17,14 +17,14 @@ choice
 	help
 	  Select the version of Lua API/ABI you wish to use.
 
-	config BR2_PACKAGE_LUA_5_1
-		bool "Lua 5.1.x"
+config BR2_PACKAGE_LUA_5_1
+	bool "Lua 5.1.x"
 
-	config BR2_PACKAGE_LUA_5_2
-		bool "Lua 5.2.x"
+config BR2_PACKAGE_LUA_5_2
+	bool "Lua 5.2.x"
 
-	config BR2_PACKAGE_LUA_5_3
-		bool "Lua 5.3.x"
+config BR2_PACKAGE_LUA_5_3
+	bool "Lua 5.3.x"
 
 endchoice
 
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 28d2bcc..bfce45c 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -45,20 +45,20 @@ choice
 	  Use this option to select the thread library implementation
 	  that should be used in your toolchain.
 
-	config BR2_PTHREADS_NATIVE
-		bool "Native POSIX Threading (NPTL)"
-		select BR2_TOOLCHAIN_HAS_THREADS
-		select BR2_TOOLCHAIN_HAS_THREADS_NPTL
-		depends on BR2_USE_MMU
-		depends on !BR2_m68k && !BR2_microblaze && !BR2_or1k
-
-	config BR2_PTHREADS
-		bool "linuxthreads"
-		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
-
-	config BR2_PTHREADS_NONE
-		bool "none"
+config BR2_PTHREADS_NATIVE
+	bool "Native POSIX Threading (NPTL)"
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_USE_MMU
+	depends on !BR2_m68k && !BR2_microblaze && !BR2_or1k
+
+config BR2_PTHREADS
+	bool "linuxthreads"
+	select BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
+
+config BR2_PTHREADS_NONE
+	bool "none"
 
 endchoice
 
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index ddceaa4..3a98b9b 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -10,265 +10,273 @@ menuconfig BR2_PACKAGE_XORG7
 	  http://xorg.freedesktop.org
 
 if BR2_PACKAGE_XORG7
-	menu "X11R7 Servers"
-		source package/x11r7/xserver_xorg-server/Config.in
-	endmenu
-	menu "X11R7 Libraries"
-		source package/x11r7/libxcb/Config.in
-		source package/x11r7/xcb-util/Config.in
-		source package/x11r7/xcb-util-cursor/Config.in
-		source package/x11r7/xcb-util-image/Config.in
-		source package/x11r7/xcb-util-keysyms/Config.in
-		source package/x11r7/xcb-util-renderutil/Config.in
-		source package/x11r7/xcb-util-wm/Config.in
-		source package/x11r7/xlib_libFS/Config.in
-		source package/x11r7/xlib_libICE/Config.in
-		source package/x11r7/xlib_libSM/Config.in
-		source package/x11r7/xlib_libX11/Config.in
-		source package/x11r7/xlib_libXScrnSaver/Config.in
-		source package/x11r7/xlib_libXau/Config.in
-		source package/x11r7/xlib_libXaw/Config.in
-		source package/x11r7/xlib_libXcomposite/Config.in
-		source package/x11r7/xlib_libXcursor/Config.in
-		source package/x11r7/xlib_libXdamage/Config.in
-		source package/x11r7/xlib_libXdmcp/Config.in
-		source package/x11r7/xlib_libXext/Config.in
-		source package/x11r7/xlib_libXfixes/Config.in
-		source package/x11r7/xlib_libXfont/Config.in
-		source package/x11r7/xlib_libXfont2/Config.in
-		source package/x11r7/xlib_libXft/Config.in
-		source package/x11r7/xlib_libXi/Config.in
-		source package/x11r7/xlib_libXinerama/Config.in
-		source package/x11r7/xlib_libXmu/Config.in
-		source package/x11r7/xlib_libXpm/Config.in
-		source package/x11r7/xlib_libXrandr/Config.in
-		source package/x11r7/xlib_libXrender/Config.in
-		source package/x11r7/xlib_libXres/Config.in
-		source package/x11r7/xlib_libXt/Config.in
-		source package/x11r7/xlib_libXtst/Config.in
-		source package/x11r7/xlib_libXv/Config.in
-		source package/x11r7/xlib_libXvMC/Config.in
-		source package/x11r7/xlib_libXxf86dga/Config.in
-		source package/x11r7/xlib_libXxf86vm/Config.in
-		source package/x11r7/xlib_libdmx/Config.in
-		source package/x11r7/xlib_libfontenc/Config.in
-		source package/x11r7/xlib_libxkbfile/Config.in
-		source package/x11r7/xlib_libxshmfence/Config.in
-		source package/x11r7/xlib_xtrans/Config.in
-	endmenu
-	menu "X11R7 Applications"
-		source package/x11r7/xapp_appres/Config.in
-		source package/x11r7/xapp_bdftopcf/Config.in
-		source package/x11r7/xapp_beforelight/Config.in
-		source package/x11r7/xapp_bitmap/Config.in
-		source package/x11r7/xapp_editres/Config.in
-		source package/x11r7/xapp_fonttosfnt/Config.in
-		source package/x11r7/xapp_fslsfonts/Config.in
-		source package/x11r7/xapp_fstobdf/Config.in
-		source package/x11r7/xapp_iceauth/Config.in
-		source package/x11r7/xapp_ico/Config.in
-		source package/x11r7/xapp_listres/Config.in
-		source package/x11r7/xapp_luit/Config.in
-		source package/x11r7/xapp_mkfontdir/Config.in
-		source package/x11r7/xapp_mkfontscale/Config.in
-		source package/x11r7/xapp_oclock/Config.in
-		source package/x11r7/xapp_rgb/Config.in
-		source package/x11r7/xapp_rstart/Config.in
-		source package/x11r7/xapp_scripts/Config.in
-		source package/x11r7/xapp_sessreg/Config.in
-		source package/x11r7/xapp_setxkbmap/Config.in
-		source package/x11r7/xapp_showfont/Config.in
-		source package/x11r7/xapp_smproxy/Config.in
-		source package/x11r7/xapp_twm/Config.in
-		source package/x11r7/xapp_viewres/Config.in
-		source package/x11r7/xapp_x11perf/Config.in
-		source package/x11r7/xapp_xauth/Config.in
-		source package/x11r7/xapp_xbacklight/Config.in
-		source package/x11r7/xapp_xbiff/Config.in
-		source package/x11r7/xapp_xcalc/Config.in
-		source package/x11r7/xapp_xclipboard/Config.in
-		source package/x11r7/xapp_xclock/Config.in
-		source package/x11r7/xapp_xcmsdb/Config.in
-		source package/x11r7/xapp_xcompmgr/Config.in
-		source package/x11r7/xapp_xconsole/Config.in
-		source package/x11r7/xapp_xcursorgen/Config.in
-		source package/x11r7/xapp_xdbedizzy/Config.in
-		source package/x11r7/xapp_xditview/Config.in
-		source package/x11r7/xapp_xdm/Config.in
-		source package/x11r7/xapp_xdpyinfo/Config.in
-		source package/x11r7/xapp_xdriinfo/Config.in
-		source package/x11r7/xapp_xedit/Config.in
-		source package/x11r7/xapp_xev/Config.in
-		source package/x11r7/xapp_xeyes/Config.in
-		source package/x11r7/xapp_xf86dga/Config.in
-		source package/x11r7/xapp_xfd/Config.in
-		source package/x11r7/xapp_xfindproxy/Config.in
-		source package/x11r7/xapp_xfontsel/Config.in
-		source package/x11r7/xapp_xfs/Config.in
-		source package/x11r7/xapp_xfsinfo/Config.in
-		source package/x11r7/xapp_xgamma/Config.in
-		source package/x11r7/xapp_xgc/Config.in
-		source package/x11r7/xapp_xhost/Config.in
-		source package/x11r7/xapp_xinit/Config.in
-		source package/x11r7/xapp_xinput/Config.in
-		source package/x11r7/xapp_xinput-calibrator/Config.in
-		source package/x11r7/xapp_xkbcomp/Config.in
-		source package/x11r7/xapp_xkbevd/Config.in
-		source package/x11r7/xapp_xkbprint/Config.in
-		source package/x11r7/xapp_xkbutils/Config.in
-		source package/x11r7/xapp_xkill/Config.in
-		source package/x11r7/xapp_xload/Config.in
-		source package/x11r7/xapp_xlogo/Config.in
-		source package/x11r7/xapp_xlsatoms/Config.in
-		source package/x11r7/xapp_xlsclients/Config.in
-		source package/x11r7/xapp_xlsfonts/Config.in
-		source package/x11r7/xapp_xmag/Config.in
-		source package/x11r7/xapp_xman/Config.in
-		source package/x11r7/xapp_xmessage/Config.in
-		source package/x11r7/xapp_xmh/Config.in
-		source package/x11r7/xapp_xmodmap/Config.in
-		source package/x11r7/xapp_xmore/Config.in
-		source package/x11r7/xapp_xpr/Config.in
-		source package/x11r7/xapp_xprop/Config.in
-		source package/x11r7/xapp_xrandr/Config.in
-		source package/x11r7/xapp_xrdb/Config.in
-		source package/x11r7/xapp_xrefresh/Config.in
-		source package/x11r7/xapp_xset/Config.in
-		source package/x11r7/xapp_xsetmode/Config.in
-		source package/x11r7/xapp_xsetpointer/Config.in
-		source package/x11r7/xapp_xsetroot/Config.in
-		source package/x11r7/xapp_xsm/Config.in
-		source package/x11r7/xapp_xstdcmap/Config.in
-		source package/x11r7/xapp_xvidtune/Config.in
-		source package/x11r7/xapp_xvinfo/Config.in
-		source package/x11r7/xapp_xwd/Config.in
-		source package/x11r7/xapp_xwininfo/Config.in
-		source package/x11r7/xapp_xwud/Config.in
-	endmenu
-	if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
-	menu "X11R7 Drivers"
-		source package/x11r7/xdriver_xf86-input-evdev/Config.in
-		source package/x11r7/xdriver_xf86-input-joystick/Config.in
-		source package/x11r7/xdriver_xf86-input-keyboard/Config.in
-		source package/x11r7/xdriver_xf86-input-libinput/Config.in
-		source package/x11r7/xdriver_xf86-input-mouse/Config.in
-		source package/x11r7/xdriver_xf86-input-synaptics/Config.in
-		source package/x11r7/xdriver_xf86-input-tslib/Config.in
-		source package/x11r7/xdriver_xf86-input-vmmouse/Config.in
-		source package/x11r7/xdriver_xf86-video-amdgpu/Config.in
-		source package/x11r7/xdriver_xf86-video-ark/Config.in
-		source package/x11r7/xdriver_xf86-video-ast/Config.in
-		source package/x11r7/xdriver_xf86-video-ati/Config.in
-		source package/x11r7/xdriver_xf86-video-cirrus/Config.in
-		source package/x11r7/xdriver_xf86-video-dummy/Config.in
-		source package/x11r7/xdriver_xf86-video-fbdev/Config.in
-		source package/x11r7/xdriver_xf86-video-fbturbo/Config.in
-		source package/x11r7/xdriver_xf86-video-geode/Config.in
-		source package/x11r7/xdriver_xf86-video-glint/Config.in
-		source package/x11r7/xdriver_xf86-video-i128/Config.in
-		source package/x11r7/xdriver_xf86-video-imx/Config.in
-		source package/x11r7/xdriver_xf86-video-imx-viv/Config.in
-		source package/x11r7/xdriver_xf86-video-intel/Config.in
-		source package/x11r7/xdriver_xf86-video-mach64/Config.in
-		source package/x11r7/xdriver_xf86-video-mga/Config.in
-		source package/x11r7/xdriver_xf86-video-neomagic/Config.in
-		source package/x11r7/xdriver_xf86-video-nouveau/Config.in
-		source package/x11r7/xdriver_xf86-video-nv/Config.in
-		source package/x11r7/xdriver_xf86-video-openchrome/Config.in
-		source package/x11r7/xdriver_xf86-video-qxl/Config.in
-		source package/x11r7/xdriver_xf86-video-r128/Config.in
-		source package/x11r7/xdriver_xf86-video-savage/Config.in
-		source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
-		source package/x11r7/xdriver_xf86-video-sis/Config.in
-		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
-		source package/x11r7/xdriver_xf86-video-tga/Config.in
-		source package/x11r7/xdriver_xf86-video-trident/Config.in
-		source package/x11r7/xdriver_xf86-video-vesa/Config.in
-		source package/x11r7/xdriver_xf86-video-vmware/Config.in
-		source package/x11r7/xdriver_xf86-video-voodoo/Config.in
-	endmenu
-	endif
-	menu "X11R7 Fonts"
-		source package/x11r7/xfont_font-util/Config.in
-		source package/x11r7/xfont_encodings/Config.in
-		source package/x11r7/xfont_font-adobe-100dpi/Config.in
-		source package/x11r7/xfont_font-adobe-75dpi/Config.in
-		source package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in
-		source package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in
-		source package/x11r7/xfont_font-adobe-utopia-type1/Config.in
-		source package/x11r7/xfont_font-alias/Config.in
-		source package/x11r7/xfont_font-arabic-misc/Config.in
-		source package/x11r7/xfont_font-bh-100dpi/Config.in
-		source package/x11r7/xfont_font-bh-75dpi/Config.in
-		source package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in
-		source package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in
-		source package/x11r7/xfont_font-bh-ttf/Config.in
-		source package/x11r7/xfont_font-bh-type1/Config.in
-		source package/x11r7/xfont_font-bitstream-100dpi/Config.in
-		source package/x11r7/xfont_font-bitstream-75dpi/Config.in
-		source package/x11r7/xfont_font-bitstream-type1/Config.in
-		source package/x11r7/xfont_font-cronyx-cyrillic/Config.in
-		source package/x11r7/xfont_font-cursor-misc/Config.in
-		source package/x11r7/xfont_font-daewoo-misc/Config.in
-		source package/x11r7/xfont_font-dec-misc/Config.in
-		source package/x11r7/xfont_font-ibm-type1/Config.in
-		source package/x11r7/xfont_font-isas-misc/Config.in
-		source package/x11r7/xfont_font-jis-misc/Config.in
-		source package/x11r7/xfont_font-micro-misc/Config.in
-		source package/x11r7/xfont_font-misc-cyrillic/Config.in
-		source package/x11r7/xfont_font-misc-ethiopic/Config.in
-		source package/x11r7/xfont_font-misc-meltho/Config.in
-		source package/x11r7/xfont_font-misc-misc/Config.in
-		source package/x11r7/xfont_font-mutt-misc/Config.in
-		source package/x11r7/xfont_font-schumacher-misc/Config.in
-		source package/x11r7/xfont_font-screen-cyrillic/Config.in
-		source package/x11r7/xfont_font-sony-misc/Config.in
-		source package/x11r7/xfont_font-sun-misc/Config.in
-		source package/x11r7/xfont_font-winitzki-cyrillic/Config.in
-		source package/x11r7/xfont_font-xfree86-type1/Config.in
-	endmenu
-	menu "X11R7 X protocols"
-		source package/x11r7/xcb-proto/Config.in
-		source package/x11r7/xproto_applewmproto/Config.in
-		source package/x11r7/xproto_bigreqsproto/Config.in
-		source package/x11r7/xproto_compositeproto/Config.in
-		source package/x11r7/xproto_damageproto/Config.in
-		source package/x11r7/xproto_dmxproto/Config.in
-		source package/x11r7/xproto_dri2proto/Config.in
-		source package/x11r7/xproto_dri3proto/Config.in
-		source package/x11r7/xproto_fixesproto/Config.in
-		source package/x11r7/xproto_fontcacheproto/Config.in
-		source package/x11r7/xproto_fontsproto/Config.in
-		source package/x11r7/xproto_glproto/Config.in
-		source package/x11r7/xproto_inputproto/Config.in
-		source package/x11r7/xproto_kbproto/Config.in
-		source package/x11r7/xproto_presentproto/Config.in
-		source package/x11r7/xproto_randrproto/Config.in
-		source package/x11r7/xproto_recordproto/Config.in
-		source package/x11r7/xproto_renderproto/Config.in
-		source package/x11r7/xproto_resourceproto/Config.in
-		source package/x11r7/xproto_scrnsaverproto/Config.in
-		source package/x11r7/xproto_videoproto/Config.in
-		source package/x11r7/xproto_windowswmproto/Config.in
-		source package/x11r7/xproto_xcmiscproto/Config.in
-		source package/x11r7/xproto_xextproto/Config.in
-		source package/x11r7/xproto_xf86bigfontproto/Config.in
-		source package/x11r7/xproto_xf86dgaproto/Config.in
-		source package/x11r7/xproto_xf86driproto/Config.in
-		source package/x11r7/xproto_xf86vidmodeproto/Config.in
-		source package/x11r7/xproto_xineramaproto/Config.in
-		source package/x11r7/xproto_xproto/Config.in
-		source package/x11r7/xproto_xproxymanagementprotocol/Config.in
-	endmenu
-	menu "X11R7 Utilities"
-		source package/x11r7/xutil_makedepend/Config.in
-		source package/x11r7/mcookie/Config.in
-	endmenu
-	menu "X11R7 Other data"
-		source package/x11r7/xdata_xbitmaps/Config.in
-		source package/x11r7/xdata_xcursor-themes/Config.in
-		source package/x11r7/xcursor-transparent-theme/Config.in
-	endmenu
+menu "X11R7 Servers"
+source package/x11r7/xserver_xorg-server/Config.in
+endmenu
+
+menu "X11R7 Libraries"
+source package/x11r7/libxcb/Config.in
+source package/x11r7/xcb-util/Config.in
+source package/x11r7/xcb-util-cursor/Config.in
+source package/x11r7/xcb-util-image/Config.in
+source package/x11r7/xcb-util-keysyms/Config.in
+source package/x11r7/xcb-util-renderutil/Config.in
+source package/x11r7/xcb-util-wm/Config.in
+source package/x11r7/xlib_libFS/Config.in
+source package/x11r7/xlib_libICE/Config.in
+source package/x11r7/xlib_libSM/Config.in
+source package/x11r7/xlib_libX11/Config.in
+source package/x11r7/xlib_libXScrnSaver/Config.in
+source package/x11r7/xlib_libXau/Config.in
+source package/x11r7/xlib_libXaw/Config.in
+source package/x11r7/xlib_libXcomposite/Config.in
+source package/x11r7/xlib_libXcursor/Config.in
+source package/x11r7/xlib_libXdamage/Config.in
+source package/x11r7/xlib_libXdmcp/Config.in
+source package/x11r7/xlib_libXext/Config.in
+source package/x11r7/xlib_libXfixes/Config.in
+source package/x11r7/xlib_libXfont/Config.in
+source package/x11r7/xlib_libXfont2/Config.in
+source package/x11r7/xlib_libXft/Config.in
+source package/x11r7/xlib_libXi/Config.in
+source package/x11r7/xlib_libXinerama/Config.in
+source package/x11r7/xlib_libXmu/Config.in
+source package/x11r7/xlib_libXpm/Config.in
+source package/x11r7/xlib_libXrandr/Config.in
+source package/x11r7/xlib_libXrender/Config.in
+source package/x11r7/xlib_libXres/Config.in
+source package/x11r7/xlib_libXt/Config.in
+source package/x11r7/xlib_libXtst/Config.in
+source package/x11r7/xlib_libXv/Config.in
+source package/x11r7/xlib_libXvMC/Config.in
+source package/x11r7/xlib_libXxf86dga/Config.in
+source package/x11r7/xlib_libXxf86vm/Config.in
+source package/x11r7/xlib_libdmx/Config.in
+source package/x11r7/xlib_libfontenc/Config.in
+source package/x11r7/xlib_libxkbfile/Config.in
+source package/x11r7/xlib_libxshmfence/Config.in
+source package/x11r7/xlib_xtrans/Config.in
+endmenu
+
+menu "X11R7 Applications"
+source package/x11r7/xapp_appres/Config.in
+source package/x11r7/xapp_bdftopcf/Config.in
+source package/x11r7/xapp_beforelight/Config.in
+source package/x11r7/xapp_bitmap/Config.in
+source package/x11r7/xapp_editres/Config.in
+source package/x11r7/xapp_fonttosfnt/Config.in
+source package/x11r7/xapp_fslsfonts/Config.in
+source package/x11r7/xapp_fstobdf/Config.in
+source package/x11r7/xapp_iceauth/Config.in
+source package/x11r7/xapp_ico/Config.in
+source package/x11r7/xapp_listres/Config.in
+source package/x11r7/xapp_luit/Config.in
+source package/x11r7/xapp_mkfontdir/Config.in
+source package/x11r7/xapp_mkfontscale/Config.in
+source package/x11r7/xapp_oclock/Config.in
+source package/x11r7/xapp_rgb/Config.in
+source package/x11r7/xapp_rstart/Config.in
+source package/x11r7/xapp_scripts/Config.in
+source package/x11r7/xapp_sessreg/Config.in
+source package/x11r7/xapp_setxkbmap/Config.in
+source package/x11r7/xapp_showfont/Config.in
+source package/x11r7/xapp_smproxy/Config.in
+source package/x11r7/xapp_twm/Config.in
+source package/x11r7/xapp_viewres/Config.in
+source package/x11r7/xapp_x11perf/Config.in
+source package/x11r7/xapp_xauth/Config.in
+source package/x11r7/xapp_xbacklight/Config.in
+source package/x11r7/xapp_xbiff/Config.in
+source package/x11r7/xapp_xcalc/Config.in
+source package/x11r7/xapp_xclipboard/Config.in
+source package/x11r7/xapp_xclock/Config.in
+source package/x11r7/xapp_xcmsdb/Config.in
+source package/x11r7/xapp_xcompmgr/Config.in
+source package/x11r7/xapp_xconsole/Config.in
+source package/x11r7/xapp_xcursorgen/Config.in
+source package/x11r7/xapp_xdbedizzy/Config.in
+source package/x11r7/xapp_xditview/Config.in
+source package/x11r7/xapp_xdm/Config.in
+source package/x11r7/xapp_xdpyinfo/Config.in
+source package/x11r7/xapp_xdriinfo/Config.in
+source package/x11r7/xapp_xedit/Config.in
+source package/x11r7/xapp_xev/Config.in
+source package/x11r7/xapp_xeyes/Config.in
+source package/x11r7/xapp_xf86dga/Config.in
+source package/x11r7/xapp_xfd/Config.in
+source package/x11r7/xapp_xfindproxy/Config.in
+source package/x11r7/xapp_xfontsel/Config.in
+source package/x11r7/xapp_xfs/Config.in
+source package/x11r7/xapp_xfsinfo/Config.in
+source package/x11r7/xapp_xgamma/Config.in
+source package/x11r7/xapp_xgc/Config.in
+source package/x11r7/xapp_xhost/Config.in
+source package/x11r7/xapp_xinit/Config.in
+source package/x11r7/xapp_xinput/Config.in
+source package/x11r7/xapp_xinput-calibrator/Config.in
+source package/x11r7/xapp_xkbcomp/Config.in
+source package/x11r7/xapp_xkbevd/Config.in
+source package/x11r7/xapp_xkbprint/Config.in
+source package/x11r7/xapp_xkbutils/Config.in
+source package/x11r7/xapp_xkill/Config.in
+source package/x11r7/xapp_xload/Config.in
+source package/x11r7/xapp_xlogo/Config.in
+source package/x11r7/xapp_xlsatoms/Config.in
+source package/x11r7/xapp_xlsclients/Config.in
+source package/x11r7/xapp_xlsfonts/Config.in
+source package/x11r7/xapp_xmag/Config.in
+source package/x11r7/xapp_xman/Config.in
+source package/x11r7/xapp_xmessage/Config.in
+source package/x11r7/xapp_xmh/Config.in
+source package/x11r7/xapp_xmodmap/Config.in
+source package/x11r7/xapp_xmore/Config.in
+source package/x11r7/xapp_xpr/Config.in
+source package/x11r7/xapp_xprop/Config.in
+source package/x11r7/xapp_xrandr/Config.in
+source package/x11r7/xapp_xrdb/Config.in
+source package/x11r7/xapp_xrefresh/Config.in
+source package/x11r7/xapp_xset/Config.in
+source package/x11r7/xapp_xsetmode/Config.in
+source package/x11r7/xapp_xsetpointer/Config.in
+source package/x11r7/xapp_xsetroot/Config.in
+source package/x11r7/xapp_xsm/Config.in
+source package/x11r7/xapp_xstdcmap/Config.in
+source package/x11r7/xapp_xvidtune/Config.in
+source package/x11r7/xapp_xvinfo/Config.in
+source package/x11r7/xapp_xwd/Config.in
+source package/x11r7/xapp_xwininfo/Config.in
+source package/x11r7/xapp_xwud/Config.in
+endmenu
+
+if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+menu "X11R7 Drivers"
+source package/x11r7/xdriver_xf86-input-evdev/Config.in
+source package/x11r7/xdriver_xf86-input-joystick/Config.in
+source package/x11r7/xdriver_xf86-input-keyboard/Config.in
+source package/x11r7/xdriver_xf86-input-libinput/Config.in
+source package/x11r7/xdriver_xf86-input-mouse/Config.in
+source package/x11r7/xdriver_xf86-input-synaptics/Config.in
+source package/x11r7/xdriver_xf86-input-tslib/Config.in
+source package/x11r7/xdriver_xf86-input-vmmouse/Config.in
+source package/x11r7/xdriver_xf86-video-amdgpu/Config.in
+source package/x11r7/xdriver_xf86-video-ark/Config.in
+source package/x11r7/xdriver_xf86-video-ast/Config.in
+source package/x11r7/xdriver_xf86-video-ati/Config.in
+source package/x11r7/xdriver_xf86-video-cirrus/Config.in
+source package/x11r7/xdriver_xf86-video-dummy/Config.in
+source package/x11r7/xdriver_xf86-video-fbdev/Config.in
+source package/x11r7/xdriver_xf86-video-fbturbo/Config.in
+source package/x11r7/xdriver_xf86-video-geode/Config.in
+source package/x11r7/xdriver_xf86-video-glint/Config.in
+source package/x11r7/xdriver_xf86-video-i128/Config.in
+source package/x11r7/xdriver_xf86-video-imx/Config.in
+source package/x11r7/xdriver_xf86-video-imx-viv/Config.in
+source package/x11r7/xdriver_xf86-video-intel/Config.in
+source package/x11r7/xdriver_xf86-video-mach64/Config.in
+source package/x11r7/xdriver_xf86-video-mga/Config.in
+source package/x11r7/xdriver_xf86-video-neomagic/Config.in
+source package/x11r7/xdriver_xf86-video-nouveau/Config.in
+source package/x11r7/xdriver_xf86-video-nv/Config.in
+source package/x11r7/xdriver_xf86-video-openchrome/Config.in
+source package/x11r7/xdriver_xf86-video-qxl/Config.in
+source package/x11r7/xdriver_xf86-video-r128/Config.in
+source package/x11r7/xdriver_xf86-video-savage/Config.in
+source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
+source package/x11r7/xdriver_xf86-video-sis/Config.in
+source package/x11r7/xdriver_xf86-video-tdfx/Config.in
+source package/x11r7/xdriver_xf86-video-tga/Config.in
+source package/x11r7/xdriver_xf86-video-trident/Config.in
+source package/x11r7/xdriver_xf86-video-vesa/Config.in
+source package/x11r7/xdriver_xf86-video-vmware/Config.in
+source package/x11r7/xdriver_xf86-video-voodoo/Config.in
+endmenu
+endif
+
+menu "X11R7 Fonts"
+source package/x11r7/xfont_font-util/Config.in
+source package/x11r7/xfont_encodings/Config.in
+source package/x11r7/xfont_font-adobe-100dpi/Config.in
+source package/x11r7/xfont_font-adobe-75dpi/Config.in
+source package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in
+source package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in
+source package/x11r7/xfont_font-adobe-utopia-type1/Config.in
+source package/x11r7/xfont_font-alias/Config.in
+source package/x11r7/xfont_font-arabic-misc/Config.in
+source package/x11r7/xfont_font-bh-100dpi/Config.in
+source package/x11r7/xfont_font-bh-75dpi/Config.in
+source package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in
+source package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in
+source package/x11r7/xfont_font-bh-ttf/Config.in
+source package/x11r7/xfont_font-bh-type1/Config.in
+source package/x11r7/xfont_font-bitstream-100dpi/Config.in
+source package/x11r7/xfont_font-bitstream-75dpi/Config.in
+source package/x11r7/xfont_font-bitstream-type1/Config.in
+source package/x11r7/xfont_font-cronyx-cyrillic/Config.in
+source package/x11r7/xfont_font-cursor-misc/Config.in
+source package/x11r7/xfont_font-daewoo-misc/Config.in
+source package/x11r7/xfont_font-dec-misc/Config.in
+source package/x11r7/xfont_font-ibm-type1/Config.in
+source package/x11r7/xfont_font-isas-misc/Config.in
+source package/x11r7/xfont_font-jis-misc/Config.in
+source package/x11r7/xfont_font-micro-misc/Config.in
+source package/x11r7/xfont_font-misc-cyrillic/Config.in
+source package/x11r7/xfont_font-misc-ethiopic/Config.in
+source package/x11r7/xfont_font-misc-meltho/Config.in
+source package/x11r7/xfont_font-misc-misc/Config.in
+source package/x11r7/xfont_font-mutt-misc/Config.in
+source package/x11r7/xfont_font-schumacher-misc/Config.in
+source package/x11r7/xfont_font-screen-cyrillic/Config.in
+source package/x11r7/xfont_font-sony-misc/Config.in
+source package/x11r7/xfont_font-sun-misc/Config.in
+source package/x11r7/xfont_font-winitzki-cyrillic/Config.in
+source package/x11r7/xfont_font-xfree86-type1/Config.in
+endmenu
+
+menu "X11R7 X protocols"
+source package/x11r7/xcb-proto/Config.in
+source package/x11r7/xproto_applewmproto/Config.in
+source package/x11r7/xproto_bigreqsproto/Config.in
+source package/x11r7/xproto_compositeproto/Config.in
+source package/x11r7/xproto_damageproto/Config.in
+source package/x11r7/xproto_dmxproto/Config.in
+source package/x11r7/xproto_dri2proto/Config.in
+source package/x11r7/xproto_dri3proto/Config.in
+source package/x11r7/xproto_fixesproto/Config.in
+source package/x11r7/xproto_fontcacheproto/Config.in
+source package/x11r7/xproto_fontsproto/Config.in
+source package/x11r7/xproto_glproto/Config.in
+source package/x11r7/xproto_inputproto/Config.in
+source package/x11r7/xproto_kbproto/Config.in
+source package/x11r7/xproto_presentproto/Config.in
+source package/x11r7/xproto_randrproto/Config.in
+source package/x11r7/xproto_recordproto/Config.in
+source package/x11r7/xproto_renderproto/Config.in
+source package/x11r7/xproto_resourceproto/Config.in
+source package/x11r7/xproto_scrnsaverproto/Config.in
+source package/x11r7/xproto_videoproto/Config.in
+source package/x11r7/xproto_windowswmproto/Config.in
+source package/x11r7/xproto_xcmiscproto/Config.in
+source package/x11r7/xproto_xextproto/Config.in
+source package/x11r7/xproto_xf86bigfontproto/Config.in
+source package/x11r7/xproto_xf86dgaproto/Config.in
+source package/x11r7/xproto_xf86driproto/Config.in
+source package/x11r7/xproto_xf86vidmodeproto/Config.in
+source package/x11r7/xproto_xineramaproto/Config.in
+source package/x11r7/xproto_xproto/Config.in
+source package/x11r7/xproto_xproxymanagementprotocol/Config.in
+endmenu
+
+menu "X11R7 Utilities"
+source package/x11r7/xutil_makedepend/Config.in
+source package/x11r7/mcookie/Config.in
+endmenu
+
+menu "X11R7 Other data"
+source package/x11r7/xdata_xbitmaps/Config.in
+source package/x11r7/xdata_xcursor-themes/Config.in
+source package/x11r7/xcursor-transparent-theme/Config.in
+endmenu
+
 endif
 
 comment "X.org needs a toolchain w/ wchar, threads, dynamic library"
-- 
2.9.3

^ permalink raw reply related

* [Buildroot] [PATCH 1/7] package configs: clean up indentation warnings.
From: Adam Duskett @ 2017-04-22 16:47 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170422155352.7c6cca5a@free-electrons.com>

Hello;

On Sat, Apr 22, 2017 at 9:53 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Fri, 21 Apr 2017 11:24:46 -0400, Adam Duskett wrote:
>> The check-package script when ran gave warnings on indentation issues
>> on all of these Config files.  This patch cleans up all warnings
>> related to the indentation of the Config files in the package directory.
>>
>> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
>> ---
>>  package/b43-firmware/Config.in       |   8 +-
>>  package/binutils/Config.in.host      |  12 +-
>>  package/gcc/Config.in.host           | 156 +++++------
>>  package/gdb/Config.in.host           |  12 +-
>>  package/jquery-ui-themes/Config.in   |  96 +++----
>>  package/kodi/Config.in               | 100 +++----
>>  package/linux-headers/Config.in.host |  85 +++---
>>  package/lua/Config.in                |  12 +-
>>  package/uclibc/Config.in             |  28 +-
>>  package/x11r7/Config.in              | 526 ++++++++++++++++++-----------------
>>  10 files changed, 522 insertions(+), 513 deletions(-)
>
> This looks good overall, except for package/Config.in. The indentation
> is done on purpose in this file, I believe so that "diff" puts some
> useful text in the context, making the patches touching
> package/Config.in easier to read.
>
> So please drop the change to package/Config.in.
>
Not sure what you mean? I don't see package/Config.in in this patch?

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

^ permalink raw reply

* [Buildroot] [PATCH] imx6q-sabresd: Add a qt5 defconfig variant
From: Fabio Estevam @ 2017-04-22 14:09 UTC (permalink / raw)
  To: buildroot

Introduce imx6q-sabresd_qt5_defconfig that supports the opensource
Etnaviv graphical stack.

This defconfig provides a way to quickly test some graphical applications,
such as kmscube, qt5, glmark2.

Currently kernel mainline exhibits issues when running cpufreq as ondemand
governor on mx6, so add a linux fragment that disables such option for the
time being.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 board/freescale/imx6q-sabresd/linux.fragment       |  1 +
 board/freescale/imx6q-sabresd/readme.txt           | 23 +++++++++
 .../imx6q-sabresd/rootfs_overlay/root/sabresd.json | 15 ++++++
 configs/imx6q-sabresd_qt5_defconfig                | 59 ++++++++++++++++++++++
 4 files changed, 98 insertions(+)
 create mode 100644 board/freescale/imx6q-sabresd/linux.fragment
 create mode 100755 board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json
 create mode 100644 configs/imx6q-sabresd_qt5_defconfig

diff --git a/board/freescale/imx6q-sabresd/linux.fragment b/board/freescale/imx6q-sabresd/linux.fragment
new file mode 100644
index 0000000..39bec58
--- /dev/null
+++ b/board/freescale/imx6q-sabresd/linux.fragment
@@ -0,0 +1 @@
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
diff --git a/board/freescale/imx6q-sabresd/readme.txt b/board/freescale/imx6q-sabresd/readme.txt
index 10e973c..b57c4fb 100644
--- a/board/freescale/imx6q-sabresd/readme.txt
+++ b/board/freescale/imx6q-sabresd/readme.txt
@@ -54,4 +54,27 @@ To boot your newly created system:
   emulator at 115200 bps, 8n1;
 - power on the board.
 
+Testing graphics on the i.MX6Q Sabre SD board
+=============================================
+
+The imx6q-sabresd_qt5_defconfig allows to quickly test the graphics
+capabilities of i.MX6 using the opensource Etnaviv graphics stack
+and kernel mainline.
+
+In order to build it:
+
+make imx6q-sabresd_qt5_defconfig
+make
+
+Then flash the SD card as explained above.
+
+Running kmscube application:
+
+# kmscube -D /dev/dri/card1
+
+Running Qt5 Cinematic Demo:
+
+# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
+# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
+
 Enjoy!
diff --git a/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json b/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json
new file mode 100755
index 0000000..9469dc1
--- /dev/null
+++ b/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json
@@ -0,0 +1,15 @@
+{
+  "device": "/dev/dri/card1",
+  "hwcursor": false,
+  "pbuffers": true,
+  "outputs": [
+    {
+      "name": "HDMI-1",
+      "mode": "off"
+    },
+    {
+      "name": "LVDS-1",
+      "mode": "1024x768"
+    }
+  ]
+}
diff --git a/configs/imx6q-sabresd_qt5_defconfig b/configs/imx6q-sabresd_qt5_defconfig
new file mode 100644
index 0000000..c438d05
--- /dev/null
+++ b/configs/imx6q-sabresd_qt5_defconfig
@@ -0,0 +1,59 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.11"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6q-sabresd/linux.fragment"
+BR2_ROOTFS_OVERLAY="board/freescale/imx6q-sabresd/rootfs_overlay"
+BR2_PACKAGE_STRACE=y
+BR2_PACKAGE_BITSTREAM_VERA=y
+BR2_PACKAGE_CANTARELL=y
+BR2_PACKAGE_DEJAVU=y
+BR2_PACKAGE_FONT_AWESOME=y
+BR2_PACKAGE_GHOSTSCRIPT_FONTS=y
+BR2_PACKAGE_INCONSOLATA=y
+BR2_PACKAGE_LIBERATION=y
+BR2_PACKAGE_GLMARK2=y
+BR2_PACKAGE_KMSCUBE=y
+BR2_PACKAGE_MESA3D_DEMOS=y
+BR2_PACKAGE_QT5CINEX=y
+BR2_PACKAGE_QT5CINEX_HD=y
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
+BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
+BR2_PACKAGE_QT5=y
+BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
+BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
+BR2_PACKAGE_QT5BASE_LINUXFB=y
+BR2_PACKAGE_QT5BASE_FONTCONFIG=y
+BR2_PACKAGE_QT5BASE_GIF=y
+BR2_PACKAGE_QT5BASE_JPEG=y
+BR2_PACKAGE_FIRMWARE_IMX=y
+BR2_PACKAGE_INPUT_TOOLS=y
+BR2_PACKAGE_LIBV4L=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=122880
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-- 
2.7.4

^ permalink raw reply related

* [Buildroot] [PATCH v2] syslog-ng: disable mongodb
From: Thomas Petazzoni @ 2017-04-22 13:59 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <2882577850f3a9d14d85f8dbbf7ceaef7916be41.1492786513.git.baruch@tkos.co.il>

Hello,

On Fri, 21 Apr 2017 17:55:13 +0300, Baruch Siach wrote:
> libbson is a dependency of the mongo-c-driver that syslog-ng uses. Buildroot
> doesn't package mongo-c-driver so syslog-ng uses the bundled one. The bundled
> mongo-c-driver in turn may optionally use a bundled libbson. When Buildroot
> builds libbson mongo-c-driver detects that and does not configure its bundled
> libbson. This breaks the build of the syslog-ng mongodb module because it adds
> the bundled libbson to the headers search path.
> 
> Disable the mongodb module to avoid this issue.
> 
> Fixes:
> http://autobuild.buildroot.net/results/843/84331e9a168d8bdf2cceca8e9e1480611c1ecaed/
> http://autobuild.buildroot.net/results/b5b/b5bad64abbf5764faf2a7129a1a25ad75c34980b/
> http://autobuild.buildroot.net/results/3c3/3c32f4eb7436da06f3fb59f928363959df2a5e86/
> 
> Cc: Chris Packham <judge.packham@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v2: Don't use bundled mongo-c-driver and libbson, just disable mongodb (Thomas P)
> ---
>  package/syslog-ng/syslog-ng.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

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

^ permalink raw reply

* [Buildroot] [git commit] syslog-ng: disable mongodb
From: Thomas Petazzoni @ 2017-04-22 13:59 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=4c2b11977a70d418b7ae2cd7d4b62e77bddbc2c6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

libbson is a dependency of the mongo-c-driver that syslog-ng uses. Buildroot
doesn't package mongo-c-driver so syslog-ng uses the bundled one. The bundled
mongo-c-driver in turn may optionally use a bundled libbson. When Buildroot
builds libbson mongo-c-driver detects that and does not configure its bundled
libbson. This breaks the build of the syslog-ng mongodb module because it adds
the bundled libbson to the headers search path.

Disable the mongodb module to avoid this issue.

Fixes:
http://autobuild.buildroot.net/results/843/84331e9a168d8bdf2cceca8e9e1480611c1ecaed/
http://autobuild.buildroot.net/results/b5b/b5bad64abbf5764faf2a7129a1a25ad75c34980b/
http://autobuild.buildroot.net/results/3c3/3c32f4eb7436da06f3fb59f928363959df2a5e86/

Cc: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/syslog-ng/syslog-ng.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 192a52b..980c783 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -13,7 +13,7 @@ SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
 # rabbit-mq needs -lrt
 SYSLOG_NG_CONF_ENV = LIBS=-lrt
 SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
-	--disable-java --disable-java-modules
+	--disable-java --disable-java-modules --disable-mongodb
 
 # We override busybox's S01logging init script
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

^ permalink raw reply related

* [Buildroot] [PATCH 3/7] package makefiles: clean up backslash spacing.
From: Thomas Petazzoni @ 2017-04-22 13:59 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170421152452.11236-3-aduskett@codeblue.com>

Hello,

On Fri, 21 Apr 2017 11:24:48 -0400, Adam Duskett wrote:
> The check-package script when ran gave warnings on only using
> one space before backslashes on all of these makefiles.
> This patch cleans up all warnings related to the one space before
> backslashes rule in the make files in the package directory.
> 
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/amd-catalyst/amd-catalyst.mk     |  2 +-
>  package/bluez5_utils/bluez5_utils.mk     |  6 +--
>  package/bluez_utils/bluez_utils.mk       | 24 +++++------
>  package/cegui06/cegui06.mk               | 28 ++++++-------
>  package/celt051/celt051.mk               | 12 +++---
>  package/connman/connman.mk               | 10 ++---
>  package/directfb/directfb.mk             |  2 +-
>  package/duma/duma.mk                     |  4 +-
>  package/efibootmgr/efibootmgr.mk         |  4 +-
>  package/giflib/giflib.mk                 |  4 +-
>  package/git/git.mk                       |  2 +-
>  package/gvfs/gvfs.mk                     |  4 +-
>  package/i2c-tools/i2c-tools.mk           |  2 +-
>  package/keyutils/keyutils.mk             | 10 ++---
>  package/kodi/kodi.mk                     |  2 +-
>  package/lesstif/lesstif.mk               |  2 +-
>  package/linux-firmware/linux-firmware.mk | 64 ++++++++++++++--------------
>  package/mplayer/mplayer.mk               |  6 +--
>  package/ngrep/ngrep.mk                   |  2 +-
>  package/ola/ola.mk                       |  2 +-
>  package/poco/poco.mk                     | 40 +++++++++---------
>  package/python-pyqt/python-pyqt.mk       |  2 +-
>  package/python-sip/python-sip.mk         |  2 +-
>  package/python/python.mk                 | 56 ++++++++++++-------------
>  package/python3/python3.mk               | 44 +++++++++----------
>  package/qemu/qemu.mk                     | 72 ++++++++++++++++----------------
>  package/rt-tests/rt-tests.mk             | 12 +++---
>  package/rtai/rtai.mk                     | 10 ++---
>  package/sdl2/sdl2.mk                     |  2 +-
>  package/skeleton/skeleton.mk             | 16 +++----
>  package/spice/spice.mk                   | 24 +++++------
>  package/squashfs/squashfs.mk             | 16 +++----
>  package/systemd/systemd.mk               |  2 +-
>  package/tvheadend/tvheadend.mk           | 32 +++++++-------
>  package/tz/tz.mk                         | 18 ++++----
>  package/tzdata/tzdata.mk                 | 18 ++++----
>  package/udisks/udisks.mk                 | 20 ++++-----
>  package/usbmount/usbmount.mk             |  4 +-
>  package/wpa_supplicant/wpa_supplicant.mk |  8 ++--
>  39 files changed, 295 insertions(+), 295 deletions(-)

Applied to master, after checking that "git diff -w HEAD^.." returned
nothing, i.e your patch contains only whitespace changes.

Thanks!

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

^ permalink raw reply

* [Buildroot] [git commit] package makefiles: clean up backslash spacing.
From: Thomas Petazzoni @ 2017-04-22 13:57 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=e2a782241582e9e7725869f35dfbe2d45cf35a3a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

The check-package script when ran gave warnings on only using
one space before backslashes on all of these makefiles.
This patch cleans up all warnings related to the one space before
backslashes rule in the make files in the package directory.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/amd-catalyst/amd-catalyst.mk     |  2 +-
 package/bluez5_utils/bluez5_utils.mk     |  6 +--
 package/bluez_utils/bluez_utils.mk       | 24 +++++------
 package/cegui06/cegui06.mk               | 28 ++++++-------
 package/celt051/celt051.mk               | 12 +++---
 package/connman/connman.mk               | 10 ++---
 package/directfb/directfb.mk             |  2 +-
 package/duma/duma.mk                     |  4 +-
 package/efibootmgr/efibootmgr.mk         |  4 +-
 package/giflib/giflib.mk                 |  4 +-
 package/git/git.mk                       |  2 +-
 package/gvfs/gvfs.mk                     |  4 +-
 package/i2c-tools/i2c-tools.mk           |  2 +-
 package/keyutils/keyutils.mk             | 10 ++---
 package/kodi/kodi.mk                     |  2 +-
 package/lesstif/lesstif.mk               |  2 +-
 package/linux-firmware/linux-firmware.mk | 64 ++++++++++++++--------------
 package/mplayer/mplayer.mk               |  6 +--
 package/ngrep/ngrep.mk                   |  2 +-
 package/ola/ola.mk                       |  2 +-
 package/poco/poco.mk                     | 40 +++++++++---------
 package/python-pyqt/python-pyqt.mk       |  2 +-
 package/python-sip/python-sip.mk         |  2 +-
 package/python/python.mk                 | 56 ++++++++++++-------------
 package/python3/python3.mk               | 44 +++++++++----------
 package/qemu/qemu.mk                     | 72 ++++++++++++++++----------------
 package/rt-tests/rt-tests.mk             | 12 +++---
 package/rtai/rtai.mk                     | 10 ++---
 package/sdl2/sdl2.mk                     |  2 +-
 package/skeleton/skeleton.mk             | 16 +++----
 package/spice/spice.mk                   | 24 +++++------
 package/squashfs/squashfs.mk             | 16 +++----
 package/systemd/systemd.mk               |  2 +-
 package/tvheadend/tvheadend.mk           | 32 +++++++-------
 package/tz/tz.mk                         | 18 ++++----
 package/tzdata/tzdata.mk                 | 18 ++++----
 package/udisks/udisks.mk                 | 20 ++++-----
 package/usbmount/usbmount.mk             |  4 +-
 package/wpa_supplicant/wpa_supplicant.mk |  8 ++--
 39 files changed, 295 insertions(+), 295 deletions(-)

diff --git a/package/amd-catalyst/amd-catalyst.mk b/package/amd-catalyst/amd-catalyst.mk
index d4f5d1c..b9396e1 100644
--- a/package/amd-catalyst/amd-catalyst.mk
+++ b/package/amd-catalyst/amd-catalyst.mk
@@ -23,7 +23,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y)
 AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x
-AMD_CATALYST_MODULE_MAKE_OPTS =  \
+AMD_CATALYST_MODULE_MAKE_OPTS = \
 	CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
 
 define AMD_CATALYST_PREPARE_MODULE
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index d19afc3..aaefcb6 100644
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -12,9 +12,9 @@ BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
 BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
 BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
-BLUEZ5_UTILS_CONF_OPTS =	\
-	--enable-tools		\
-	--enable-library	\
+BLUEZ5_UTILS_CONF_OPTS = \
+	--enable-tools \
+	--enable-library \
 	--disable-cups
 
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 8425921..b396886 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -16,24 +16,24 @@ BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
 # BlueZ 3.x compatibility
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--enable-hidd	\
-	--enable-pand	\
-	--enable-sdp	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--enable-hidd \
+	--enable-pand \
+	--enable-sdp \
 	--enable-dund
 endif
 
 # audio support
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
-BLUEZ_UTILS_DEPENDENCIES +=	\
-	alsa-lib		\
+BLUEZ_UTILS_DEPENDENCIES += \
+	alsa-lib \
 	libsndfile
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--enable-alsa	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--enable-alsa \
 	--enable-audio
 else
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--disable-alsa	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--disable-alsa \
 	--disable-audio
 endif
 
@@ -47,10 +47,10 @@ endif
 # USB support
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
 BLUEZ_UTILS_DEPENDENCIES += libusb
-BLUEZ_UTILS_CONF_OPTS +=	\
+BLUEZ_UTILS_CONF_OPTS += \
 	--enable-usb
 else
-BLUEZ_UTILS_CONF_OPTS +=	\
+BLUEZ_UTILS_CONF_OPTS += \
 	--disable-usb
 endif
 
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
index 8b2c886..d3da3eb 100644
--- a/package/cegui06/cegui06.mk
+++ b/package/cegui06/cegui06.mk
@@ -13,24 +13,24 @@ CEGUI06_LICENSE = MIT
 CEGUI06_LICENSE_FILES = COPYING
 CEGUI06_INSTALL_STAGING = YES
 
-CEGUI06_DEPENDENCIES =              \
-	expat                       \
-	freetype                    \
+CEGUI06_DEPENDENCIES = \
+	expat \
+	freetype \
 	pcre
 
-CEGUI06_CONF_OPTS =                 \
-	--enable-expat              \
-	--disable-external-tinyxml  \
-	--disable-xerces-c          \
-	--disable-libxml            \
-	--disable-tinyxml           \
-	--disable-opengl-renderer   \
-	--disable-external-glew     \
+CEGUI06_CONF_OPTS = \
+	--enable-expat \
+	--disable-external-tinyxml \
+	--disable-xerces-c \
+	--disable-libxml \
+	--disable-tinyxml \
+	--disable-opengl-renderer \
+	--disable-external-glew \
 	--disable-irrlicht-renderer \
 	--disable-directfb-renderer \
-	--disable-samples           \
-	--disable-lua-module        \
-	--disable-toluacegui        \
+	--disable-samples \
+	--disable-lua-module \
+	--disable-toluacegui \
 	--disable-external-toluapp
 
 $(eval $(autotools-package))
diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
index a5b6f47..01da5c9 100644
--- a/package/celt051/celt051.mk
+++ b/package/celt051/celt051.mk
@@ -18,13 +18,13 @@ CELT051_DEPENDENCIES = libogg
 # if target is the same kind as host (ie. same arch, same bitness,
 # same endianness, so that /usr/lib contains libraries linkable by
 # our cross-compiler)
-CELT051_CONF_OPTS =                       \
-	--enable-fixed-point              \
-	--disable-fixed-point-debug       \
+CELT051_CONF_OPTS = \
+	--enable-fixed-point \
+	--disable-fixed-point-debug \
 	--disable-experimental-postfilter \
-	--disable-static-modes            \
-	--disable-assertions              \
-	--disable-oggtest                 \
+	--disable-static-modes \
+	--disable-assertions \
+	--disable-oggtest \
 	--with-ogg=$(STAGING_DIR)/usr
 
 $(eval $(autotools-package))
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 5c9a05f..0a56568 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -13,12 +13,12 @@ CONNMAN_LICENSE = GPL-2.0
 CONNMAN_LICENSE_FILES = COPYING
 CONNMAN_CONF_OPTS += \
 	--with-dbusconfdir=/etc \
-	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug)		\
-	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet)	\
-	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi)			\
+	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
+	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
+	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
 	$(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \
-	$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth)	\
-	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback)	\
+	$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
+	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
 	$(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
 	$(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \
 	$(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index a27d6a7..0e3bd1f 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -70,7 +70,7 @@ DIRECTFB_GFX = \
 	$(if $(BR2_PACKAGE_DIRECTFB_CYBER5K),cyber5k) \
 	$(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \
 	$(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
-	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830)	\
+	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \
 	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
diff --git a/package/duma/duma.mk b/package/duma/duma.mk
index 6299691..0e8a623 100644
--- a/package/duma/duma.mk
+++ b/package/duma/duma.mk
@@ -18,9 +18,9 @@ DUMA_OPTIONS = \
 # The dependency of some source files in duma_config.h, which is generated at
 # build time, is not specified in the Makefile. Force non-parallel build.
 define DUMA_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS)       \
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
 		OS=linux \
-		DUMA_OPTIONS="$(DUMA_OPTIONS)"   \
+		DUMA_OPTIONS="$(DUMA_OPTIONS)" \
 		$(DUMA_CPP) -C $(@D)
 endef
 
diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk
index b9b520a..094dd28 100644
--- a/package/efibootmgr/efibootmgr.mk
+++ b/package/efibootmgr/efibootmgr.mk
@@ -18,12 +18,12 @@ endef
 EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH
 
 define EFIBOOTMGR_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS)			\
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 		LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D)
 endef
 
 define EFIBOOTMGR_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)	\
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		DESTDIR=$(TARGET_DIR) install
 endef
 
diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk
index 799ae73..c1471de 100644
--- a/package/giflib/giflib.mk
+++ b/package/giflib/giflib.mk
@@ -13,8 +13,8 @@ GIFLIB_LICENSE_FILES = COPYING
 
 GIFLIB_BINS = \
 	gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifbuild gifburst gifclip \
-	gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip  \
-	gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat     \
+	gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip \
+	gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
 	gifrsize gifspnge giftext giftool gifwedge icon2gif raw2gif rgb2gif \
 	text2gif
 
diff --git a/package/git/git.mk b/package/git/git.mk
index d0e9f3b..c2e4b8d 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -33,7 +33,7 @@ endif
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 GIT_DEPENDENCIES += libcurl
 GIT_CONF_OPTS += --with-curl
-GIT_CONF_ENV +=	\
+GIT_CONF_ENV += \
 	ac_cv_prog_curl_config=$(STAGING_DIR)/usr/bin/$(LIBCURL_CONFIG_SCRIPTS)
 else
 GIT_CONF_OPTS += --without-curl
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index d6211fd..ce182a7 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -132,8 +132,8 @@ define GVFS_COMPILE_SCHEMAS
 endef
 
 GVFS_POST_INSTALL_TARGET_HOOKS += \
-	GVFS_REMOVE_USELESS_BINARY	\
-	GVFS_REMOVE_TARGET_SCHEMAS	\
+	GVFS_REMOVE_USELESS_BINARY \
+	GVFS_REMOVE_TARGET_SCHEMAS \
 	GVFS_COMPILE_SCHEMAS
 
 $(eval $(autotools-package))
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index 1995ca2..fccce9a 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -30,7 +30,7 @@ I2C_TOOLS_PYTHON_BASE_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) -I../include"
 
 define I2C_TOOLS_BUILD_PYSMBUS
-	(cd $(@D)/py-smbus;  \
+	(cd $(@D)/py-smbus; \
 	$(I2C_TOOLS_PYTHON_BASE_ENV) \
 		$(HOST_DIR)/usr/bin/python setup.py build \
 		$(PKG_PYTHON_DISTUTILS_BUILD_OPTS))
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
index 81006ac..0e725d1 100644
--- a/package/keyutils/keyutils.mk
+++ b/package/keyutils/keyutils.mk
@@ -11,11 +11,11 @@ KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+
 KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
 KEYUTILS_INSTALL_STAGING = YES
 
-KEYUTILS_MAKE_PARAMS =                    \
-	INSTALL=$(INSTALL)                \
-	LIBDIR=/usr/lib                   \
-	USRLIBDIR=/usr/lib                \
-	CFLAGS="$(TARGET_CFLAGS)"         \
+KEYUTILS_MAKE_PARAMS = \
+	INSTALL=$(INSTALL) \
+	LIBDIR=/usr/lib \
+	USRLIBDIR=/usr/lib \
+	CFLAGS="$(TARGET_CFLAGS)" \
 	CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
 	LNS="$(HOSTLN) -sf"
 
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index ebce84d..ed0cec8 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -69,7 +69,7 @@ KODI_CONF_ENV = \
 	USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
 	TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
 
-KODI_CONF_OPTS +=  \
+KODI_CONF_OPTS += \
 	--with-ffmpeg=shared \
 	--disable-joystick \
 	--disable-openmax \
diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk
index 933dd13..35d2c6d 100644
--- a/package/lesstif/lesstif.mk
+++ b/package/lesstif/lesstif.mk
@@ -17,7 +17,7 @@ LESSTIF_LICENSE_FILES = COPYING.LIB
 LESSTIF_CONF_OPTS = \
 	--with-gnu-ld \
 	--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
-	--enable-production=yes	\
+	--enable-production=yes \
 	--enable-build-tests=no \
 	--no-recursion
 
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 33bc0cf..2611941 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -53,11 +53,11 @@ endif
 # rtl81xx
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX),y)
 LINUX_FIRMWARE_FILES += \
-	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin		\
-	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin	\
-	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin		\
-	rtlwifi/rtl8188efw.bin rtlwifi/rtl8188eufw.bin		\
-	rtlwifi/rtl8192cufw_A.bin				\
+	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \
+	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \
+	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \
+	rtlwifi/rtl8188efw.bin rtlwifi/rtl8188eufw.bin \
+	rtlwifi/rtl8192cufw_A.bin \
 	rtlwifi/rtl8192cufw_B.bin rtlwifi/rtl8192cufw_TMSC.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
 endif
@@ -192,19 +192,19 @@ endif
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
 # wl1271-nvs.bin is a symlink to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
-	ti-connectivity/wl1271-fw-2.bin				\
-	ti-connectivity/wl1271-fw-ap.bin			\
-	ti-connectivity/wl1271-fw.bin				\
-	ti-connectivity/wl1271-nvs.bin				\
-	ti-connectivity/wl127x-fw-3.bin				\
-	ti-connectivity/wl127x-fw-plt-3.bin			\
-	ti-connectivity/wl127x-nvs.bin				\
-	ti-connectivity/wl127x-fw-4-mr.bin			\
-	ti-connectivity/wl127x-fw-4-plt.bin			\
-	ti-connectivity/wl127x-fw-4-sr.bin			\
-	ti-connectivity/wl127x-fw-5-mr.bin			\
-	ti-connectivity/wl127x-fw-5-plt.bin			\
-	ti-connectivity/wl127x-fw-5-sr.bin			\
+	ti-connectivity/wl1271-fw-2.bin \
+	ti-connectivity/wl1271-fw-ap.bin \
+	ti-connectivity/wl1271-fw.bin \
+	ti-connectivity/wl1271-nvs.bin \
+	ti-connectivity/wl127x-fw-3.bin \
+	ti-connectivity/wl127x-fw-plt-3.bin \
+	ti-connectivity/wl127x-nvs.bin \
+	ti-connectivity/wl127x-fw-4-mr.bin \
+	ti-connectivity/wl127x-fw-4-plt.bin \
+	ti-connectivity/wl127x-fw-4-sr.bin \
+	ti-connectivity/wl127x-fw-5-mr.bin \
+	ti-connectivity/wl127x-fw-5-plt.bin \
+	ti-connectivity/wl127x-fw-5-sr.bin \
 	ti-connectivity/TIInit_7.2.31.bts
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
@@ -213,20 +213,20 @@ endif
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y)
 # wl1271-nvs.bin and wl12xx-nvs.bin are symlinks to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
-	ti-connectivity/wl128x-fw-3.bin				\
-	ti-connectivity/wl128x-fw-ap.bin			\
-	ti-connectivity/wl128x-fw-plt-3.bin			\
-	ti-connectivity/wl128x-fw.bin				\
-	ti-connectivity/wl1271-nvs.bin				\
-	ti-connectivity/wl128x-nvs.bin				\
-	ti-connectivity/wl12xx-nvs.bin				\
-	ti-connectivity/wl127x-nvs.bin				\
-	ti-connectivity/wl128x-fw-4-mr.bin			\
-	ti-connectivity/wl128x-fw-4-plt.bin			\
-	ti-connectivity/wl128x-fw-4-sr.bin			\
-	ti-connectivity/wl128x-fw-5-mr.bin			\
-	ti-connectivity/wl128x-fw-5-plt.bin			\
-	ti-connectivity/wl128x-fw-5-sr.bin			\
+	ti-connectivity/wl128x-fw-3.bin \
+	ti-connectivity/wl128x-fw-ap.bin \
+	ti-connectivity/wl128x-fw-plt-3.bin \
+	ti-connectivity/wl128x-fw.bin \
+	ti-connectivity/wl1271-nvs.bin \
+	ti-connectivity/wl128x-nvs.bin \
+	ti-connectivity/wl12xx-nvs.bin \
+	ti-connectivity/wl127x-nvs.bin \
+	ti-connectivity/wl128x-fw-4-mr.bin \
+	ti-connectivity/wl128x-fw-4-plt.bin \
+	ti-connectivity/wl128x-fw-4-sr.bin \
+	ti-connectivity/wl128x-fw-5-mr.bin \
+	ti-connectivity/wl128x-fw-5-plt.bin \
+	ti-connectivity/wl128x-fw-5-sr.bin \
 	ti-connectivity/TIInit_7.2.31.bts
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index 88f2fb4..f43ec5d 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -56,7 +56,7 @@ MPLAYER_CONF_OPTS += --disable-sdl
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--enable-freetype \
 	--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
 MPLAYER_DEPENDENCIES += freetype
@@ -128,7 +128,7 @@ MPLAYER_CONF_OPTS += --disable-libcdio
 # We intentionally don't pass --enable-dvdread, to let the
 # autodetection find which library to link with.
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
 MPLAYER_DEPENDENCIES += libdvdread
 endif
@@ -136,7 +136,7 @@ endif
 # We intentionally don't pass --enable-dvdnav to let the autodetection
 # find which library to link with.
 ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--with-dvdnav-config="$(PKG_CONFIG_HOST_BINARY) dvdnav"
 MPLAYER_DEPENDENCIES += libdvdnav
 endif
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index f6238e6..3f56937 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -17,7 +17,7 @@ NGREP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
 endif
 NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
 
-NGREP_CONF_OPTS =  \
+NGREP_CONF_OPTS = \
 	--with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \
 	--enable-pcre \
 	--with-pcre=$(STAGING_DIR)/usr \
diff --git a/package/ola/ola.mk b/package/ola/ola.mk
index 251dda3..9348d70 100644
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -35,7 +35,7 @@ HOST_OLA_CONF_OPTS = \
 	--disable-uart \
 	--disable-libusb \
 	--disable-libftdi \
-	--disable-http  \
+	--disable-http \
 	--disable-examples \
 	--disable-unittests \
 	--disable-doxygen-html \
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index efb78be..3b27ddb 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -11,22 +11,22 @@ POCO_LICENSE_FILES = LICENSE
 POCO_INSTALL_STAGING = YES
 POCO_PATCH = https://github.com/pocoproject/poco/commit/30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch
 
-POCO_DEPENDENCIES = zlib pcre					\
-	$(if $(BR2_PACKAGE_POCO_XML),expat)			\
-	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl)		\
-	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl)	\
-	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite)		\
+POCO_DEPENDENCIES = zlib pcre \
+	$(if $(BR2_PACKAGE_POCO_XML),expat) \
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
+	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
 	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
 
-POCO_OMIT = Data/ODBC PageCompiler					\
-	$(if $(BR2_PACKAGE_POCO_XML),,XML)				\
-	$(if $(BR2_PACKAGE_POCO_UTIL),,Util)				\
-	$(if $(BR2_PACKAGE_POCO_NET),,Net)				\
-	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL)	\
-	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto)			\
-	$(if $(BR2_PACKAGE_POCO_ZIP),,Zip)				\
-	$(if $(BR2_PACKAGE_POCO_DATA),,Data)				\
-	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL)		\
+POCO_OMIT = Data/ODBC PageCompiler \
+	$(if $(BR2_PACKAGE_POCO_XML),,XML) \
+	$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
+	$(if $(BR2_PACKAGE_POCO_NET),,Net) \
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
+	$(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
+	$(if $(BR2_PACKAGE_POCO_DATA),,Data) \
+	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
 	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
 
 ifeq ($(LIBC),uclibc)
@@ -48,12 +48,12 @@ endif
 
 define POCO_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_MAKE_ENV) ./configure \
-		--config=Linux		\
-		--prefix=/usr		\
-		--omit="$(POCO_OMIT)"	\
-		$(POCO_CONF_OPTS)	\
-		--unbundled		\
-		--no-tests		\
+		--config=Linux \
+		--prefix=/usr \
+		--omit="$(POCO_OMIT)" \
+		$(POCO_CONF_OPTS) \
+		--unbundled \
+		--no-tests \
 		--no-samples)
 endef
 
diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk
index ab658e9..9b05f0b 100644
--- a/package/python-pyqt/python-pyqt.mk
+++ b/package/python-pyqt/python-pyqt.mk
@@ -84,7 +84,7 @@ PYTHON_PYQT_CONF_OPTS = \
 # Python 3.x.
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON_PYQT_CONF_OPTS += \
-	--vendorid-incdir $(STAGING_DIR)/usr/include/$(PYTHON_PYQT_PYTHON_DIR)  \
+	--vendorid-incdir $(STAGING_DIR)/usr/include/$(PYTHON_PYQT_PYTHON_DIR) \
 	--vendorid-libdir $(STAGING_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/config
 endif
 
diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk
index 1d84e83..1bba269 100644
--- a/package/python-sip/python-sip.mk
+++ b/package/python-sip/python-sip.mk
@@ -46,7 +46,7 @@ define PYTHON_SIP_CONFIGURE_CMDS
 		$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python configure.py \
 			--bindir $(TARGET_DIR)/usr/bin \
 			--destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \
-			--incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR)  \
+			--incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \
 			--sipdir $(TARGET_DIR)/usr/share/sip \
 			--sysroot $(STAGING_DIR)/usr \
 			--use-qmake && \
diff --git a/package/python/python.mk b/package/python/python.mk
index 7ba5e37..d3f7b31 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -17,23 +17,23 @@ PYTHON_LIBTOOL_PATCH = NO
 # also installed in $(HOST_DIR), as it is needed when cross-compiling
 # third-party Python modules.
 
-HOST_PYTHON_CONF_OPTS +=	\
-	--enable-static		\
-	--without-cxx-main	\
-	--disable-sqlite3	\
-	--disable-tk		\
-	--with-expat=system	\
-	--disable-curses	\
-	--disable-codecs-cjk	\
-	--disable-nis		\
-	--enable-unicodedata	\
-	--disable-dbm		\
-	--disable-gdbm		\
-	--disable-bsddb		\
-	--disable-test-modules	\
-	--disable-bz2		\
-	--disable-ssl		\
-	--disable-ossaudiodev	\
+HOST_PYTHON_CONF_OPTS += \
+	--enable-static \
+	--without-cxx-main \
+	--disable-sqlite3 \
+	--disable-tk \
+	--with-expat=system \
+	--disable-curses \
+	--disable-codecs-cjk \
+	--disable-nis \
+	--enable-unicodedata \
+	--disable-dbm \
+	--disable-gdbm \
+	--disable-bsddb \
+	--disable-test-modules \
+	--disable-bz2 \
+	--disable-ssl \
+	--disable-ossaudiodev \
 	--disable-pyo-build
 
 # Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -159,17 +159,17 @@ PYTHON_CONF_ENV += ac_cv_big_endian_double=yes
 endif
 
 PYTHON_CONF_OPTS += \
-	--without-cxx-main	\
-	--without-doc-strings	\
-	--with-system-ffi	\
-	--disable-pydoc		\
-	--disable-test-modules	\
-	--disable-lib2to3	\
-	--disable-gdbm		\
-	--disable-tk		\
-	--disable-nis		\
-	--disable-dbm		\
-	--disable-pyo-build	\
+	--without-cxx-main \
+	--without-doc-strings \
+	--with-system-ffi \
+	--disable-pydoc \
+	--disable-test-modules \
+	--disable-lib2to3 \
+	--disable-gdbm \
+	--disable-tk \
+	--disable-nis \
+	--disable-dbm \
+	--disable-pyo-build \
 	--disable-pyc-build
 
 # This is needed to make sure the Python build process doesn't try to
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 2532dee..60a15f8 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -24,19 +24,19 @@ PYTHON3_LIBTOOL_PATCH = NO
 # installed in $(HOST_DIR), as it is needed when cross-compiling
 # third-party Python modules.
 
-HOST_PYTHON3_CONF_OPTS +=	\
-	--without-ensurepip	\
-	--without-cxx-main	\
-	--disable-sqlite3	\
-	--disable-tk		\
-	--with-expat=system	\
-	--disable-curses	\
-	--disable-codecs-cjk	\
-	--disable-nis		\
-	--enable-unicodedata	\
-	--disable-test-modules	\
-	--disable-idle3		\
-	--disable-ossaudiodev	\
+HOST_PYTHON3_CONF_OPTS += \
+	--without-ensurepip \
+	--without-cxx-main \
+	--disable-sqlite3 \
+	--disable-tk \
+	--with-expat=system \
+	--disable-curses \
+	--disable-codecs-cjk \
+	--disable-nis \
+	--enable-unicodedata \
+	--disable-test-modules \
+	--disable-idle3 \
+	--disable-ossaudiodev \
 	--disable-openssl
 
 # Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -151,15 +151,15 @@ PYTHON3_CONF_ENV += ac_cv_func_wcsftime=no
 endif
 
 PYTHON3_CONF_OPTS += \
-	--without-ensurepip	\
-	--without-cxx-main	\
-	--with-system-ffi	\
-	--disable-pydoc		\
-	--disable-test-modules	\
-	--disable-lib2to3	\
-	--disable-tk		\
-	--disable-nis		\
-	--disable-idle3		\
+	--without-ensurepip \
+	--without-cxx-main \
+	--with-system-ffi \
+	--disable-pydoc \
+	--disable-test-modules \
+	--disable-lib2to3 \
+	--disable-tk \
+	--disable-nis \
+	--disable-idle3 \
 	--disable-pyc-build
 
 # Python builds two tools to generate code: 'pgen' and
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 2b6aafb..9335467 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -215,42 +215,42 @@ endif
 # Override CPP, as it expects to be able to call it like it'd
 # call the compiler.
 define QEMU_CONFIGURE_CMDS
-	( cd $(@D);                                     \
-		LIBS='$(QEMU_LIBS)'                     \
-		$(TARGET_CONFIGURE_OPTS)                \
-		$(TARGET_CONFIGURE_ARGS)                \
-		CPP="$(TARGET_CC) -E"			\
-		$(QEMU_VARS)                            \
-		./configure                             \
-			--prefix=/usr                   \
-			--cross-prefix=$(TARGET_CROSS)  \
-			--with-system-pixman            \
-			--audio-drv-list=               \
-			--enable-kvm                    \
-			--enable-attr                   \
-			--enable-vhost-net              \
-			--disable-bsd-user              \
-			--disable-xen                   \
-			--disable-slirp                 \
-			--disable-vnc                   \
-			--disable-virtfs                \
-			--disable-brlapi                \
-			--disable-curses                \
-			--disable-curl                  \
-			--disable-bluez                 \
-			--disable-uuid                  \
-			--disable-vde                   \
-			--disable-linux-aio             \
-			--disable-cap-ng                \
-			--disable-docs                  \
-			--disable-spice                 \
-			--disable-rbd                   \
-			--disable-libiscsi              \
-			--disable-usb-redir             \
-			--disable-strip                 \
-			--disable-seccomp               \
-			--disable-sparse                \
-			$(QEMU_OPTS)                    \
+	( cd $(@D); \
+		LIBS='$(QEMU_LIBS)' \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		CPP="$(TARGET_CC) -E" \
+		$(QEMU_VARS) \
+		./configure \
+			--prefix=/usr \
+			--cross-prefix=$(TARGET_CROSS) \
+			--with-system-pixman \
+			--audio-drv-list= \
+			--enable-kvm \
+			--enable-attr \
+			--enable-vhost-net \
+			--disable-bsd-user \
+			--disable-xen \
+			--disable-slirp \
+			--disable-vnc \
+			--disable-virtfs \
+			--disable-brlapi \
+			--disable-curses \
+			--disable-curl \
+			--disable-bluez \
+			--disable-uuid \
+			--disable-vde \
+			--disable-linux-aio \
+			--disable-cap-ng \
+			--disable-docs \
+			--disable-spice \
+			--disable-rbd \
+			--disable-libiscsi \
+			--disable-usb-redir \
+			--disable-strip \
+			--disable-seccomp \
+			--disable-sparse \
+			$(QEMU_OPTS) \
 	)
 endef
 
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index fb0ce5d..273949a 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -15,16 +15,16 @@ RT_TESTS_DEPENDENCIES = python
 endif
 
 define RT_TESTS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)	\
-		CC="$(TARGET_CC)"		\
-		CFLAGS="$(TARGET_CFLAGS)"	\
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		prefix=/usr
 endef
 
 define RT_TESTS_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)		\
-		DESTDIR="$(TARGET_DIR)"			\
-		prefix=/usr				\
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" \
+		prefix=/usr \
 		$(if $(BR2_PACKAGE_PYTHON),PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/,PYLIB="") \
 		install
 endef
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
index 35e8fc1..90f2cc4 100644
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -20,11 +20,11 @@ RTAI_DEPENDENCIES = linux
 
 RTAI_CONF_OPTS = \
 	--includedir=/usr/include/rtai \
-	--with-linux-dir=$(LINUX_DIR)	\
-	--disable-leds			\
-	--enable-usi			\
-	--enable-align-priority		\
-	--disable-rtailab		\
+	--with-linux-dir=$(LINUX_DIR) \
+	--disable-leds \
+	--enable-usi \
+	--enable-align-priority \
+	--disable-rtailab \
 	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai
 
 RTAI_MAKE = $(MAKE1)
diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
index f8a3196..a0a4489 100644
--- a/package/sdl2/sdl2.mk
+++ b/package/sdl2/sdl2.mk
@@ -48,7 +48,7 @@ SDL2_DEPENDENCIES += xlib_libX11 xlib_libXext
 SDL2_CONF_OPTS += --enable-video-x11 \
 	--with-x=$(STAGING_DIR) \
 	--x-includes=$(STAGING_DIR)/usr/include \
-	--x-libraries=$(STAGING_DIR)/usr/lib  \
+	--x-libraries=$(STAGING_DIR)/usr/lib \
 	--enable-video-x11-xshape
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk
index 9940944..1321eb6 100644
--- a/package/skeleton/skeleton.mk
+++ b/package/skeleton/skeleton.mk
@@ -148,9 +148,9 @@ endif
 define SKELETON_SET_NETWORK_LOCALHOST
 	( \
 		echo "# interface file auto-generated by buildroot"; \
-		echo ;                                               \
-		echo "auto lo";                                      \
-		echo "iface lo inet loopback";                       \
+		echo ; \
+		echo "auto lo"; \
+		echo "iface lo inet loopback"; \
 	) > $(TARGET_DIR)/etc/network/interfaces
 endef
 
@@ -159,11 +159,11 @@ SKELETON_NETWORK_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
 ifneq ($(SKELETON_NETWORK_DHCP_IFACE),)
 define SKELETON_SET_NETWORK_DHCP
 	( \
-		echo ;                                               \
-		echo "auto $(SKELETON_NETWORK_DHCP_IFACE)";                   \
-		echo "iface $(SKELETON_NETWORK_DHCP_IFACE) inet dhcp";        \
-		echo "	pre-up /etc/network/nfs_check";              \
-		echo "	wait-delay 15";                              \
+		echo ; \
+		echo "auto $(SKELETON_NETWORK_DHCP_IFACE)"; \
+		echo "iface $(SKELETON_NETWORK_DHCP_IFACE) inet dhcp"; \
+		echo "	pre-up /etc/network/nfs_check"; \
+		echo "	wait-delay 15"; \
 	) >> $(TARGET_DIR)/etc/network/interfaces
 	$(INSTALL) -m 0755 -D $(SKELETON_PKGDIR)/nfs_check \
 		$(TARGET_DIR)/etc/network/nfs_check
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 086f5d6..1d26ddc 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -10,21 +10,21 @@ SPICE_SITE = http://www.spice-space.org/download/releases
 SPICE_LICENSE = LGPL-2.1+
 SPICE_LICENSE_FILES = COPYING
 SPICE_INSTALL_STAGING = YES
-SPICE_DEPENDENCIES =        \
-	alsa-lib            \
-	celt051             \
-	jpeg                \
-	libglib2            \
-	openssl             \
-	pixman              \
-	python-pyparsing    \
+SPICE_DEPENDENCIES = \
+	alsa-lib \
+	celt051 \
+	jpeg \
+	libglib2 \
+	openssl \
+	pixman \
+	python-pyparsing \
 	spice-protocol
 
 # We disable everything for now, because the dependency tree can become
 # quite deep if we try to enable some features, and I have not tested that.
-SPICE_CONF_OPTS =                 \
-	--disable-opengl          \
-	--disable-smartcard       \
+SPICE_CONF_OPTS = \
+	--disable-opengl \
+	--disable-smartcard \
 	--disable-automated-tests \
 	--without-sasl
 
@@ -58,7 +58,7 @@ SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/
 # it should link against libz and libjpeg. libz is pkg-config-aware, while
 # libjpeg isn't, hence the two-line tweak
 define SPICE_POST_INSTALL_STAGING_FIX_PC
-	$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;'    \
+	$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
 		"$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
 endef
 SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 65c39c1..7e1d9cc 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -50,16 +50,16 @@ HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
 
 HOST_SQUASHFS_MAKE_ARGS = \
 	XATTR_SUPPORT=1 \
-	XZ_SUPPORT=1    \
-	GZIP_SUPPORT=1  \
-	LZ4_SUPPORT=1	\
-	LZO_SUPPORT=1	\
+	XZ_SUPPORT=1 \
+	GZIP_SUPPORT=1 \
+	LZ4_SUPPORT=1 \
+	LZO_SUPPORT=1 \
 	LZMA_XZ_SUPPORT=1
 
 define SQUASHFS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE)    \
-		CC="$(TARGET_CC)"           \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)"   \
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		CC="$(TARGET_CC)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		$(SQUASHFS_MAKE_ARGS) \
 		-C $(@D)/squashfs-tools/
@@ -73,7 +73,7 @@ endef
 define HOST_SQUASHFS_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) \
 		CC="$(HOSTCC)" \
-		EXTRA_CFLAGS="$(HOST_CFLAGS)"   \
+		EXTRA_CFLAGS="$(HOST_CFLAGS)" \
 		EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
 		$(HOST_SQUASHFS_MAKE_ARGS) \
 		-C $(@D)/squashfs-tools/
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index d8872c4..5112d53 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -132,7 +132,7 @@ endif
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 SYSTEMD_DEPENDENCIES += libgcrypt
 SYSTEMD_CONF_OPTS += \
-	--enable-gcrypt	\
+	--enable-gcrypt \
 	--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
 	--with-libgpg-error-prefix=$(STAGING_DIR)/usr
 else
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 0336019..5ac44da 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -70,22 +70,22 @@ endef
 TVHEADEND_PRE_CONFIGURE_HOOKS += TVHEADEND_INSTALL_DTV_SCAN_TABLES
 
 define TVHEADEND_CONFIGURE_CMDS
-	(cd $(@D);						\
-		$(TARGET_CONFIGURE_OPTS)			\
-		$(TARGET_CONFIGURE_ARGS)			\
-		CFLAGS="$(TVHEADEND_CFLAGS)"			\
-		./configure					\
-			--prefix=/usr				\
-			--arch="$(ARCH)"			\
-			--cpu="$(BR2_GCC_TARGET_CPU)"		\
-			--nowerror				\
-			--python="$(HOST_DIR)/usr/bin/python"	\
-			--enable-dvbscan			\
-			--enable-bundle				\
-			--enable-pngquant			\
-			--disable-ffmpeg_static			\
-			--disable-hdhomerun_static		\
-			$(TVHEADEND_CONF_OPTS)			\
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		CFLAGS="$(TVHEADEND_CFLAGS)" \
+		./configure \
+			--prefix=/usr \
+			--arch="$(ARCH)" \
+			--cpu="$(BR2_GCC_TARGET_CPU)" \
+			--nowerror \
+			--python="$(HOST_DIR)/usr/bin/python" \
+			--enable-dvbscan \
+			--enable-bundle \
+			--enable-pngquant \
+			--disable-ffmpeg_static \
+			--disable-hdhomerun_static \
+			$(TVHEADEND_CONF_OPTS) \
 	)
 endef
 
diff --git a/package/tz/tz.mk b/package/tz/tz.mk
index f0daf46..4d1c8c4 100644
--- a/package/tz/tz.mk
+++ b/package/tz/tz.mk
@@ -10,11 +10,11 @@ TZ_LICENSE = Public domain
 TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
 
 define TZ_BUILD_CMDS
-	(cd $(HOST_DIR)/usr/share/zoneinfo/posix/;                 \
-		for i in $$(find . -type f); do                    \
-			mkdir -p $(@D)/output/$$(dirname $$i);         \
+	(cd $(HOST_DIR)/usr/share/zoneinfo/posix/; \
+		for i in $$(find . -type f); do \
+			mkdir -p $(@D)/output/$$(dirname $$i); \
 			$(TZDUMP) -p . -q $${i#./} | sed '1d' > $(@D)/output/$$i; \
-		done                                               \
+		done \
 	)
 endef
 
@@ -25,13 +25,13 @@ define TZ_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
 	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
 	cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
-	if [ -n "$(TZ_LOCALTIME)" ]; then                               \
+	if [ -n "$(TZ_LOCALTIME)" ]; then \
 		if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
 			printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
-			"$(TZDATA_LOCALTIME)";                              \
-			exit 1;                                             \
-		fi;                                                         \
-		cd $(TARGET_DIR)/etc;                                       \
+			"$(TZDATA_LOCALTIME)"; \
+			exit 1; \
+		fi; \
+		cd $(TARGET_DIR)/etc; \
 		ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
 	fi
 endef
diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
index 68a0484..802d847 100644
--- a/package/tzdata/tzdata.mk
+++ b/package/tzdata/tzdata.mk
@@ -32,19 +32,19 @@ TZDATA_EXTRACT_CMDS =
 define TZDATA_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo
 	cp -a $(HOST_DIR)/usr/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo
-	cd $(TARGET_DIR)/usr/share/zoneinfo;    \
-	for zone in posix/*; do                 \
-	    ln -sfn "$${zone}" "$${zone##*/}";  \
+	cd $(TARGET_DIR)/usr/share/zoneinfo; \
+	for zone in posix/*; do \
+	    ln -sfn "$${zone}" "$${zone##*/}"; \
 	done
-	if [ -n "$(TZDATA_LOCALTIME)" ]; then                           \
+	if [ -n "$(TZDATA_LOCALTIME)" ]; then \
 	    if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
 	        printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
-	               "$(TZDATA_LOCALTIME)";                           \
-	        exit 1;                                                 \
-	    fi;                                                         \
-	    cd $(TARGET_DIR)/etc;                                       \
+	               "$(TZDATA_LOCALTIME)"; \
+	        exit 1; \
+	    fi; \
+	    cd $(TARGET_DIR)/etc; \
 	    ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \
-	    echo "$(TZDATA_LOCALTIME)" >timezone;                       \
+	    echo "$(TZDATA_LOCALTIME)" >timezone; \
 	fi
 endef
 
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index 119bcc6..fe8932a 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -11,16 +11,16 @@ UDISKS_LICENSE_FILES = COPYING
 # For 0002-Fix-systemd-service-file.patch
 UDISKS_AUTORECONF = YES
 
-UDISKS_DEPENDENCIES =	\
-	sg3_utils	\
-	host-pkgconf	\
-	udev		\
-	dbus		\
-	dbus-glib	\
-	polkit		\
-	parted		\
-	lvm2		\
-	libatasmart	\
+UDISKS_DEPENDENCIES = \
+	sg3_utils \
+	host-pkgconf \
+	udev \
+	dbus \
+	dbus-glib \
+	polkit \
+	parted \
+	lvm2 \
+	libatasmart \
 	libgudev
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 9007175..538602f 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -14,9 +14,9 @@ USBMOUNT_LICENSE_FILES = debian/copyright
 define USBMOUNT_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
 
-	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink	\
+	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \
 		$(TARGET_DIR)/etc/usbmount/mount.d/00_create_model_symlink
-	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink	\
+	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \
 		$(TARGET_DIR)/etc/usbmount/umount.d/00_remove_model_symlink
 
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 6658662..2e8b82c 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -24,9 +24,9 @@ WPA_SUPPLICANT_CONFIG_EDITS =
 WPA_SUPPLICANT_CONFIG_SET = CONFIG_BGSCAN_SIMPLE
 
 WPA_SUPPLICANT_CONFIG_ENABLE = \
-	CONFIG_IEEE80211AC	\
-	CONFIG_IEEE80211N	\
-	CONFIG_IEEE80211R	\
+	CONFIG_IEEE80211AC \
+	CONFIG_IEEE80211N \
+	CONFIG_IEEE80211R \
 	CONFIG_INTERNAL_LIBTOMMATH \
 	CONFIG_DEBUG_FILE \
 	CONFIG_MATCH_IFACE
@@ -101,7 +101,7 @@ endif
 ifeq ($(BR2_PACKAGE_DBUS),y)
 WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
 WPA_SUPPLICANT_MAKE_ENV = \
-	PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)"	\
+	PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 	PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y)

^ permalink raw reply related

* [Buildroot] [PATCH 2/7] package configs: clean up ordering.
From: Thomas Petazzoni @ 2017-04-22 13:56 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170421152452.11236-2-aduskett@codeblue.com>

Hello,

On Fri, 21 Apr 2017 11:24:47 -0400, Adam Duskett wrote:
> The check-package script when ran gives warnings on ordering issues
> on all of these Config files.  This patch cleans up all warnings
> related to the ordering in the Config files in the package directory.
> 
> The appropriate ordering is: type, default, depends on, select, help
> See http://nightly.buildroot.org/#_config_files for more information.
> 
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>

This is really too long/too boring to review. I believe this should
rather be done progressively, or split into smaller patches. One patch
per package is quite certainly too much. Maybe one patch for packages
starting with "a", one for packages starting with "b", etc.

But don't send the whole thing at once. We don't want to have the
patchwork backlog flooded by cleanup patches.

Thanks,

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

^ permalink raw reply

* [Buildroot] [PATCH 1/7] package configs: clean up indentation warnings.
From: Thomas Petazzoni @ 2017-04-22 13:53 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170421152452.11236-1-aduskett@codeblue.com>

Hello,

On Fri, 21 Apr 2017 11:24:46 -0400, Adam Duskett wrote:
> The check-package script when ran gave warnings on indentation issues
> on all of these Config files.  This patch cleans up all warnings
> related to the indentation of the Config files in the package directory.
> 
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/b43-firmware/Config.in       |   8 +-
>  package/binutils/Config.in.host      |  12 +-
>  package/gcc/Config.in.host           | 156 +++++------
>  package/gdb/Config.in.host           |  12 +-
>  package/jquery-ui-themes/Config.in   |  96 +++----
>  package/kodi/Config.in               | 100 +++----
>  package/linux-headers/Config.in.host |  85 +++---
>  package/lua/Config.in                |  12 +-
>  package/uclibc/Config.in             |  28 +-
>  package/x11r7/Config.in              | 526 ++++++++++++++++++-----------------
>  10 files changed, 522 insertions(+), 513 deletions(-)

This looks good overall, except for package/Config.in. The indentation
is done on purpose in this file, I believe so that "diff" puts some
useful text in the context, making the patches touching
package/Config.in easier to read.

So please drop the change to package/Config.in.

Thanks,

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

^ permalink raw reply

* [Buildroot] [PATCH 7/7] qt.mk: fix header.
From: Thomas Petazzoni @ 2017-04-22 13:52 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170421152452.11236-7-aduskett@codeblue.com>

Hello,

On Fri, 21 Apr 2017 11:24:52 -0400, Adam Duskett wrote:
> The header was non-standard according to check-package.
> 
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/qt/qt.mk | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)

Applied to master, thanks.

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

^ permalink raw reply

* [Buildroot] [PATCH 6/7] qt5.mk: add header
From: Thomas Petazzoni @ 2017-04-22 13:52 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170421152452.11236-6-aduskett@codeblue.com>

Hello,

On Fri, 21 Apr 2017 11:24:51 -0400, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/qt5/qt5.mk | 6 ++++++
>  1 file changed, 6 insertions(+)

Applied to master, thanks.

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

^ permalink raw reply

* [Buildroot] [PATCH 5/7] xenomai.mk: fix expected indent with tabs.
From: Thomas Petazzoni @ 2017-04-22 13:52 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170421152452.11236-5-aduskett@codeblue.com>

Hello,

On Fri, 21 Apr 2017 11:24:50 -0400, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/xenomai/xenomai.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

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

^ permalink raw reply

* [Buildroot] [PATCH 4/7] busybox.mk: fix unexpected indent with tabs.
From: Thomas Petazzoni @ 2017-04-22 13:51 UTC (permalink / raw)
  To: buildroot
In-Reply-To: <20170421152452.11236-4-aduskett@codeblue.com>

Hello,

On Fri, 21 Apr 2017 11:24:49 -0400, Adam Duskett wrote:
> Signed-off-by: Adam Duskett <aduskett@codeblue.com>
> ---
>  package/busybox/busybox.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

The commit title was not properly formatted:

 - The prefix should have been "busybox:" or "package/busybox:"

 - No final dot

Applied with this fixed.

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

^ permalink raw reply

* [Buildroot] [git commit] package/qt: fix header
From: Thomas Petazzoni @ 2017-04-22 13:51 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=42ec2bd4a4ec7337c34772559024fcc9e135c898
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

The header was non-standard according to check-package.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt/qt.mk | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 2580ee7..690a4b4 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -1,13 +1,6 @@
 ################################################################################
 #
-# Qt Embedded for Linux
-#
-# This makefile was originally composed by Thomas Lundquist <thomasez@zelow.no>
-# Later heavily modified by buildroot developers
-#
-# BTW, this uses alot of FPU calls and it's pretty slow if you use
-# the kernels FPU emulation so it's better to choose soft float in the
-# buildroot config (and uClibc.config of course, if you have your own.)
+# qt
 #
 ################################################################################
 

^ permalink raw reply related

* [Buildroot] [git commit] package/qt5: add comment header
From: Thomas Petazzoni @ 2017-04-22 13:50 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=edc2d7b0a4d0af8f5456310da106c1d26b50ab48
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt5/qt5.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk
index 9e77ce3..5c7af39 100644
--- a/package/qt5/qt5.mk
+++ b/package/qt5/qt5.mk
@@ -1,3 +1,9 @@
+################################################################################
+#
+# qt5
+#
+################################################################################
+
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 QT5_VERSION_MAJOR = 5.8
 QT5_VERSION = $(QT5_VERSION_MAJOR).0

^ permalink raw reply related

* [Buildroot] [git commit] package/xenomai: properly indent XENOMAI_DEVICES variable
From: Thomas Petazzoni @ 2017-04-22 13:50 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=58dd42a59a963f05123e50a594ea4b82d1571733
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/xenomai/xenomai.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 2d92e91..4844fff 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -136,9 +136,9 @@ endef
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
 
 define XENOMAI_DEVICES
-/dev/rtheap  c  666  0  0  10  254  0  0  -
-/dev/rtscope c  666  0  0  10  253  0  0  -
-/dev/rtp     c  666  0  0  150 0    0  1  32
+	/dev/rtheap  c  666  0  0  10  254  0  0  -
+	/dev/rtscope c  666  0  0  10  253  0  0  -
+	/dev/rtp     c  666  0  0  150 0    0  1  32
 endef
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)

^ permalink raw reply related


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox