package/x*/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 x 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/x11r7/xapp_luit/Config.in b/package/x11r7/xapp_luit/Config.in
index 3e314de182b47ab2cf0c861c4712d27a57bd1620..69da5706f54e6c6ddfa2ac23dbbdf49e7bf08d3c 100644 (file)
--- a/package/x11r7/xapp_luit/Config.in
+++ b/package/x11r7/xapp_luit/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XAPP_LUIT
        bool "luit"
+       depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBFONTENC
-       depends on BR2_USE_MMU # fork()
        help
          Locale and ISO 2022 support for Unicode terminals

diff --git a/package/x11r7/xapp_xconsole/Config.in b/package/x11r7/xapp_xconsole/Config.in
index 1aaa118793b923d2832c381c45f24f217f61cbb5..7baf4ff6af25ee47cb4099a2727e29a712c1f3d0 100644 (file)
--- a/package/x11r7/xapp_xconsole/Config.in
+++ b/package/x11r7/xapp_xconsole/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_XAPP_XCONSOLE
        bool "xconsole"
+       depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXAW
        select BR2_PACKAGE_XLIB_LIBXT
        select BR2_PACKAGE_XPROTO_XPROTO
        select BR2_PACKAGE_XLIB_LIBXMU
-       depends on BR2_USE_MMU # fork()
        help
          xconsole - monitor system console messages with X

diff --git a/package/x11r7/xapp_xdriinfo/Config.in b/package/x11r7/xapp_xdriinfo/Config.in
index 36dc5770e9d0946f7d872f1a9e91e8ab886f0310..2b204d91714dd63c586694f809b3d6b092c5ab17 100644 (file)
--- a/package/x11r7/xapp_xdriinfo/Config.in
+++ b/package/x11r7/xapp_xdriinfo/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_XAPP_XDRIINFO
        bool "xdriinfo"
+       depends on BR2_PACKAGE_HAS_LIBGL
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XPROTO_GLPROTO
-       depends on BR2_PACKAGE_HAS_LIBGL
        help
          query configuration information of DRI drivers
 

diff --git a/package/x11r7/xapp_xedit/Config.in b/package/x11r7/xapp_xedit/Config.in
index feaea7486f68bdf4a975ba6cbf59a0bc408249d8..876d54126b52dbd2e4959890bbeff04eab979878 100644 (file)
--- a/package/x11r7/xapp_xedit/Config.in
+++ b/package/x11r7/xapp_xedit/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XAPP_XEDIT
        bool "xedit"
-       select BR2_PACKAGE_XLIB_LIBXAW
        depends on BR2_USE_MMU # fork()
+       select BR2_PACKAGE_XLIB_LIBXAW
        help
          simple text editor for X

diff --git a/package/x11r7/xapp_xf86dga/Config.in b/package/x11r7/xapp_xf86dga/Config.in
index 8a13bd4df1cbfd2f1be57410a1c09fa4200c8865..5d812033cdaa8d5749dc82d33c8dc1de32549641 100644 (file)
--- a/package/x11r7/xapp_xf86dga/Config.in
+++ b/package/x11r7/xapp_xf86dga/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XAPP_XF86DGA
        bool "xf86dga"
+       depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXXF86DGA
-       depends on BR2_USE_MMU # fork()
        help
          test program for the XFree86-DGA extension

diff --git a/package/x11r7/xapp_xfs/Config.in b/package/x11r7/xapp_xfs/Config.in
index 8b72445f8a6103a58f9c0053b65f44a84384088f..0a5d71152450da51c07bfc2c40fc2c582c0fd900 100644 (file)
--- a/package/x11r7/xapp_xfs/Config.in
+++ b/package/x11r7/xapp_xfs/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_XAPP_XFS
        bool "xfs"
+       depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_XLIB_LIBFS
        select BR2_PACKAGE_XLIB_LIBXFONT
        select BR2_PACKAGE_XPROTO_FONTSPROTO
-       depends on BR2_USE_MMU # fork()
        help
          X font server

diff --git a/package/x11r7/xcb-util-cursor/Config.in b/package/x11r7/xcb-util-cursor/Config.in
index ca304941b7200d289ab061ebb5fec4c3a07cd45f..aa81615c5961c0b5f91e4437158f94a3308474e4 100644 (file)
--- a/package/x11r7/xcb-util-cursor/Config.in
+++ b/package/x11r7/xcb-util-cursor/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_XCB_UTIL_CURSOR
        bool "xcb-util-cursor"
+       depends on BR2_PACKAGE_LIBXCB
        select BR2_PACKAGE_XCB_UTIL
        select BR2_PACKAGE_XCB_UTIL_IMAGE
        select BR2_PACKAGE_XCB_UTIL_RENDERUTIL
-       depends on BR2_PACKAGE_LIBXCB
        help
          The XCB util modules provides a number of libraries which
          sit on top of libxcb, the core X protocol library, and some

diff --git a/package/x11r7/xcb-util-renderutil/Config.in b/package/x11r7/xcb-util-renderutil/Config.in
index 53b2a8c41761f3d27e43a55d4fa56c5ec8a9a149..088bb18f8d5a9ddc9d0d94abf64fc007874910cd 100644 (file)
--- a/package/x11r7/xcb-util-renderutil/Config.in
+++ b/package/x11r7/xcb-util-renderutil/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XCB_UTIL_RENDERUTIL
        bool "xcb-util-renderutil"
-       select BR2_PACKAGE_XCB_UTIL
        depends on BR2_PACKAGE_LIBXCB # xcb-util
+       select BR2_PACKAGE_XCB_UTIL
        help
          The XCB util modules provides a number of libraries which
          sit on top of libxcb, the core X protocol library, and some

diff --git a/package/x11r7/xdriver_xf86-video-geode/Config.in b/package/x11r7/xdriver_xf86-video-geode/Config.in
index 0b45fb165df5ac12c385be51e4534c30f4889cd8..fe217b922cc8467a93a91ad5048e54f31dd7fadd 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-geode/Config.in
+++ b/package/x11r7/xdriver_xf86-video-geode/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE
        bool "xf86-video-geode"
+       depends on BR2_i386
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO
        select BR2_PACKAGE_XPROTO_RENDERPROTO
        select BR2_PACKAGE_XPROTO_VIDEOPROTO
        select BR2_PACKAGE_XPROTO_XPROTO
-       depends on BR2_i386
        help
          video driver for geode device

diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 4bbffb2c21a7ec546ffd0c32ce87e29b553990ab..87a844d8bf6c7c031e82ee7ebf689f6f0508a428 100644 (file)
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -98,10 +98,10 @@ config BR2_PACKAGE_XENOMAI_ENABLE_SMP
 
 config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
        bool "Enable registry"
-       select BR2_PACKAGE_LIBFUSE
        depends on !BR2_STATIC_LIBS # libfuse
        depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
        depends on BR2_USE_MMU # libfuse
+       select BR2_PACKAGE_LIBFUSE
        help
          Xenomai APIs can export their internal state through a
          pseudo-filesystem, whose files may be read to obtain

diff --git a/package/xorriso/Config.in b/package/xorriso/Config.in
index f9bb10ac9c3bfdb87ff0f0968e1de4bce4669a6a..60b2642daf019397f963ffb970ee878981b442cb 100644 (file)
--- a/package/xorriso/Config.in
+++ b/package/xorriso/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_XORRISO
        bool "xorriso"
-       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
          xorriso copies file objects from POSIX compliant
          filesystems into Rock Ridge enhanced ISO 9660 filesystems

diff --git a/package/xterm/Config.in b/package/xterm/Config.in
index f11aafad7add6b18b323714e7c5a1de548156540..f3bc4500a8c9e49f95f3f1f53c5644b52143d8a8 100644 (file)
--- a/package/xterm/Config.in
+++ b/package/xterm/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_XTERM
        bool "xterm"
-       select BR2_PACKAGE_NCURSES
-       select BR2_PACKAGE_XLIB_LIBXAW
        depends on BR2_PACKAGE_XORG7
        depends on BR2_USE_MMU # fork()
        # ARC toolchain issue
        depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
+       select BR2_PACKAGE_NCURSES
+       select BR2_PACKAGE_XLIB_LIBXAW
        help
          xterm terminal emulator
 

diff --git a/package/xvisor/Config.in b/package/xvisor/Config.in
index 996d37afbe97e33f677c985dc0bfddbb0f0cb74f..1f8fd1ff18f5a25522e8447d7e2a5f7f7a24b477 100644 (file)
--- a/package/xvisor/Config.in
+++ b/package/xvisor/Config.in
@@ -32,12 +32,12 @@ endchoice
 
 config BR2_PACKAGE_XVISOR_DEFCONFIG
        string "Defconfig name"
-       depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG
        default "generic-v5" if BR2_ARM_CPU_ARMV5
        default "generic-v6" if BR2_ARM_CPU_ARMV6
        default "generic-v7" if BR2_ARM_CPU_ARMV7A
        default "generic-v8" if BR2_AARCH64
        default "x86_64_generic" if BR2_x86_64
+       depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG
        help
          Name of the Xvisor defconfig file to use, without the
          trailing -defconfig. The defconfig is located in