package/m*/Config.in: fix ordering of statements

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 m 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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/mali-t76x/Config.in b/package/mali-t76x/Config.in
index 26a7f6c00d0d0747af712ba7fe623390fcc9b211..07f1f3189423ca3cde89ea195d56c888116919f9 100644 (file)
--- a/package/mali-t76x/Config.in
+++ b/package/mali-t76x/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_MALI_T76X
        bool "mali-t76x"
-       select BR2_PACKAGE_MESA3D_HEADERS
-       select BR2_PACKAGE_HAS_LIBEGL
-       select BR2_PACKAGE_HAS_LIBGLES
        depends on BR2_TOOLCHAIN_USES_GLIBC
        depends on BR2_ARM_EABIHF
        depends on BR2_arm
+       select BR2_PACKAGE_MESA3D_HEADERS
+       select BR2_PACKAGE_HAS_LIBEGL
+       select BR2_PACKAGE_HAS_LIBGLES
        help
          Install the binary user-space components for the ARM Mali Midgard
          T76X GPU. This package requires a kernel with the ARM Mali Midgard

diff --git a/package/matchbox-common/Config.in b/package/matchbox-common/Config.in
index 5a038e17dafca072fce1a3e176c6ea73d2b16cfb..587a0694e8ebececdd11af07188a506501f82d94 100644 (file)
--- a/package/matchbox-common/Config.in
+++ b/package/matchbox-common/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MATCHBOX_COMMON
        bool "matchbox-common"
-       select BR2_PACKAGE_MATCHBOX_LIB
        depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
+       select BR2_PACKAGE_MATCHBOX_LIB
        help
          Common desktop folders and matchbox-session script.
 

diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in
index 7e62bf2e7bec11d3461683dd20d0d57a35085d99..afaed4a730eee92427b8aa87e550dfa9adf6c300 100644 (file)
--- a/package/mediastreamer/Config.in
+++ b/package/mediastreamer/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_MEDIASTREAMER
        bool "mediastreamer"
-       select BR2_PACKAGE_ORTP
        depends on BR2_INSTALL_LIBSTDCPP # ortp
        depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
+       select BR2_PACKAGE_ORTP
        help
          Mediastreamer is a powerful and lightweighted streaming
          engine specialized for voice/video telephony applications.

diff --git a/package/menu-cache/Config.in b/package/menu-cache/Config.in
index b75c8ec054d50c9e02c82c4b527405eb85c54fd5..e61ca447c10bd0518039b3fa38c2f914e155b2e6 100644 (file)
--- a/package/menu-cache/Config.in
+++ b/package/menu-cache/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_MENU_CACHE
        bool "menu-cache"
-       select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_LIBFM_EXTRA
        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_LIBFM_EXTRA
        help
          Small library from LXDE project used for application menu
          integration

diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in
index f22c0dee917f2aa51dcd0e8159264e6c0e0d185e..b716cf579918c913c4f5244f410cbec940c31af1 100644 (file)
--- a/package/mesa3d-demos/Config.in
+++ b/package/mesa3d-demos/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_MESA3D_DEMOS
        bool "mesa3d-demos"
+       depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
+               || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
        select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
        select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
        select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
        select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
-       depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
-               || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
        help
          OpenGL demos from the Mesa 3D project.
 

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 099dfd42bde71b21e839741b2e53aa0a0dbb89b3..e5ff7d73dbd918ddc11b07cef0d382aae9654f97 100644 (file)
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -24,14 +24,14 @@ if BR2_PACKAGE_MESA3D
 
 # inform the .mk file of gallium, dri or vulkan driver selection
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
-       select BR2_PACKAGE_MESA3D_DRIVER
        bool
+       select BR2_PACKAGE_MESA3D_DRIVER
 
 config BR2_PACKAGE_MESA3D_DRI_DRIVER
+       bool
        select BR2_PACKAGE_MESA3D_DRIVER
        select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
        select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO
-       bool
 
 config BR2_PACKAGE_MESA3D_VULKAN_DRIVER
        bool

diff --git a/package/micropython-lib/Config.in b/package/micropython-lib/Config.in
index 599af7797bd821632ea41f5e507c84adf134834b..76557b220baf2adc81108a5f1713bfafcdd69208 100644 (file)
--- a/package/micropython-lib/Config.in
+++ b/package/micropython-lib/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MICROPYTHON_LIB
        bool "micropython-lib"
-       select BR2_PACKAGE_PCRE # runtime
        depends on BR2_PACKAGE_MICROPYTHON
+       select BR2_PACKAGE_PCRE # runtime
        help
          Core Python libraries ported to MicroPython.
 

diff --git a/package/micropython/Config.in b/package/micropython/Config.in
index ed65d6ab30269046480c272edaf4dcc0107e6eee..ac06d7ffc1b213200ec5a913c99d87599f19cbc8 100644 (file)
--- a/package/micropython/Config.in
+++ b/package/micropython/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_MICROPYTHON
        bool "micropython"
-       select BR2_PACKAGE_LIBFFI
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on !BR2_STATIC_LIBS
        # libffi doesn't provide the closure implementation on Blackfin
        depends on !BR2_bfin
+       select BR2_PACKAGE_LIBFFI
        help
          Micro Python is a lean and fast implementation of the Python 3
          programming language that is optimised to run on a microcontroller.

diff --git a/package/midori/Config.in b/package/midori/Config.in
index 0d7672c1344cde7864a2cdabccac0952e7a14ec6..840d689f773d4fdcc1b09ea2480754ce1f6b9e38 100644 (file)
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -5,6 +5,12 @@ comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9"
 
 config BR2_PACKAGE_MIDORI
        bool "midori"
+       depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2
+       depends on BR2_PACKAGE_LIBGTK3
+       depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
+       depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # webkitgtk
+       depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk
+       depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
        # GCR can only be used with the X11 backend
        select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11
        select BR2_PACKAGE_GRANITE
@@ -15,12 +21,6 @@ config BR2_PACKAGE_MIDORI
        select BR2_PACKAGE_WEBKITGTK
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-       depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2
-       depends on BR2_PACKAGE_LIBGTK3
-       depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
-       depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # webkitgtk
-       depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk
-       depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
        help
          Midori is a lightweight web browser based on WebKit
 

diff --git a/package/mjpegtools/Config.in b/package/mjpegtools/Config.in
index 6a36109da2a51e8f24644fe2717999438a90f72a..c486361a875bb865532253240c2ae8d25be5044c 100644 (file)
--- a/package/mjpegtools/Config.in
+++ b/package/mjpegtools/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_MJPEGTOOLS
        bool "mjpegtools"
-       select BR2_PACKAGE_JPEG
        depends on BR2_USE_MMU # fork
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       select BR2_PACKAGE_JPEG
        help
          The mjpegtools programs are a set of tools
          that can do recording of videos and playback,

diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
index 796bae6d806ae9a777c1bb4c318228fc72b74581..a9b09b786ce3b88fec58f7253240439571d59d5b 100644 (file)
--- a/package/mongrel2/Config.in
+++ b/package/mongrel2/Config.in
@@ -14,12 +14,12 @@ comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic lib
 
 config BR2_PACKAGE_MONGREL2
        bool "mongrel2"
-       select BR2_PACKAGE_SQLITE
-       select BR2_PACKAGE_ZEROMQ
        depends on BR2_INSTALL_LIBSTDCPP # zeromq
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
        depends on !BR2_STATIC_LIBS # uses dlopen()
        depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
+       select BR2_PACKAGE_SQLITE
+       select BR2_PACKAGE_ZEROMQ
        help
          Mongrel2 is an application, language, and network architecture
          agnostic web server that focuses on web applications using

diff --git a/package/mtdev2tuio/Config.in b/package/mtdev2tuio/Config.in
index 4195ecfeebfc40e8acd5fe116d17e832a1ac31b5..3e88d21845ed5080bf6363c8b80527eae948e3ea 100644 (file)
--- a/package/mtdev2tuio/Config.in
+++ b/package/mtdev2tuio/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_MTDEV2TUIO
        bool "mtdev2tuio"
+       depends on BR2_TOOLCHAIN_HAS_THREADS # liblo
        select BR2_PACKAGE_LIBLO
        select BR2_PACKAGE_MTDEV
-       depends on BR2_TOOLCHAIN_HAS_THREADS # liblo
        help
          mtdev2tuio is a simple application for converting touch
          events captured from libmtdev to TUIO 1.1

diff --git a/package/musl/Config.in b/package/musl/Config.in
index 2775313af5619285db50082ba98c89e1d2336a2a..bedc50cd455a5fde8af4ad2679fcc5c12cfd51b4 100644 (file)
--- a/package/musl/Config.in
+++ b/package/musl/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MUSL
        bool
-       depends on BR2_TOOLCHAIN_USES_MUSL
        default y
+       depends on BR2_TOOLCHAIN_USES_MUSL
        select BR2_PACKAGE_LINUX_HEADERS
        # SSP broken on i386/ppc: http://www.openwall.com/lists/musl/2016/12/04/2
        select BR2_TOOLCHAIN_HAS_SSP if !(BR2_i386 || BR2_powerpc)