package/o*/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 o 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/odroid-mali/Config.in b/package/odroid-mali/Config.in
index e5c07f237880e1122fdd426e2b7ab1de2e44b8f3..1c31c2d0e3ee7d42049de20db9db1137cb2723ea 100644 (file)
--- a/package/odroid-mali/Config.in
+++ b/package/odroid-mali/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_ODROID_MALI
        bool "odroid-mali"
+       depends on BR2_TOOLCHAIN_USES_GLIBC
+       depends on BR2_aarch64 || BR2_ARM_EABIHF
        select BR2_PACKAGE_HAS_LIBEGL
        select BR2_PACKAGE_HAS_LIBGLES
        select BR2_PACKAGE_ODROID_SCRIPTS # runtime
-       depends on BR2_TOOLCHAIN_USES_GLIBC
-       depends on BR2_aarch64 || BR2_ARM_EABIHF
        help
          Install the ARM Mali drivers for odroidc2 based systems.
 

diff --git a/package/on2-8170-libs/Config.in b/package/on2-8170-libs/Config.in
index 40cad3d00c267aa9e171097356611b91e6dacc57..2a60c581e49fcfac133a0befcdf2dea7c1ed4678 100644 (file)
--- a/package/on2-8170-libs/Config.in
+++ b/package/on2-8170-libs/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_ON2_8170_LIBS
+       bool "on2-8170-libs"
        #This is a binary only package which has been compiled for glibc
        depends on BR2_arm926t
        depends on BR2_TOOLCHAIN_USES_GLIBC
        depends on BR2_LINUX_KERNEL # on2-8170-modules
        select BR2_PACKAGE_ON2_8170_MODULES # runtime
-       bool "on2-8170-libs"
        help
          Libraries for Hantro X170 video decoder
 

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index c046baaa4b4352d68844315117679c278f7d9ac4..0260851340db52f303098e90562d32d88b7aaec4 100644 (file)
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -1,9 +1,9 @@
 menuconfig BR2_PACKAGE_OPENCV
        bool "opencv-2.4"
-       select BR2_PACKAGE_ZLIB
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
+       select BR2_PACKAGE_ZLIB
        help
          OpenCV (Open Source Computer Vision) is a library of programming
          functions for real time computer vision.
@@ -52,13 +52,13 @@ config BR2_PACKAGE_OPENCV_LIB_FLANN
 config BR2_PACKAGE_OPENCV_LIB_GPU
        bool "gpu"
        depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_OPENCV_LIB_CALIB3D
        select BR2_PACKAGE_OPENCV_LIB_IMGPROC
        select BR2_PACKAGE_OPENCV_LIB_LEGACY
        select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
        select BR2_PACKAGE_OPENCV_LIB_PHOTO
        select BR2_PACKAGE_OPENCV_LIB_VIDEO
-       depends on !BR2_STATIC_LIBS
        help
          Include opencv_gpu module into the OpenCV build.
 

diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index ee589f950f08046b7373bdebccaf7ffd5f7fb82a..3b0a9d60c9f6ce02197422aae853b51ddd3bc388 100644 (file)
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -1,12 +1,12 @@
 menuconfig BR2_PACKAGE_OPENCV3
        bool "opencv3"
-       select BR2_PACKAGE_ZLIB
        depends on BR2_TOOLCHAIN_HAS_ATOMIC
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
        depends on !BR2_STATIC_LIBS # include dlfcn.h
        depends on !BR2_PACKAGE_OPENCV
+       select BR2_PACKAGE_ZLIB
        help
          OpenCV (Open Source Computer Vision) is a library of programming
          functions for real time computer vision.

diff --git a/package/opengl/libegl/Config.in b/package/opengl/libegl/Config.in
index f756fbeadfe7fef1a5e99f57a9926c45b23c411d..a23699894797ba8254196799d13e00fe2d3297b4 100644 (file)
--- a/package/opengl/libegl/Config.in
+++ b/package/opengl/libegl/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_HAS_LIBEGL_WAYLAND
        depends on BR2_PACKAGE_HAS_LIBEGL
 
 config BR2_PACKAGE_PROVIDES_LIBEGL
-       depends on BR2_PACKAGE_HAS_LIBEGL
        string
+       depends on BR2_PACKAGE_HAS_LIBEGL

diff --git a/package/opengl/libgl/Config.in b/package/opengl/libgl/Config.in
index 8b99e5bdd35fe4a0b8ce74ea48a3730ef8de1aef..b9a1602a727fa205af218c17cd6bf0cb6ad32fb0 100644 (file)
--- a/package/opengl/libgl/Config.in
+++ b/package/opengl/libgl/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBGL
        bool
 
 config BR2_PACKAGE_PROVIDES_LIBGL
-       depends on BR2_PACKAGE_HAS_LIBGL
        string
+       depends on BR2_PACKAGE_HAS_LIBGL

diff --git a/package/opengl/libgles/Config.in b/package/opengl/libgles/Config.in
index b7b800f3f211e4fab9329295d6796621d170b7a0..090ef16d42382501664857f91a1dd393ed5ddee7 100644 (file)
--- a/package/opengl/libgles/Config.in
+++ b/package/opengl/libgles/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBGLES
        bool
 
 config BR2_PACKAGE_PROVIDES_LIBGLES
-       depends on BR2_PACKAGE_HAS_LIBGLES
        string
+       depends on BR2_PACKAGE_HAS_LIBGLES

diff --git a/package/opengl/libopenmax/Config.in b/package/opengl/libopenmax/Config.in
index d50f2ced1f2bfffb08e2401318f0480b31b49ebc..901426abd61814bb692f76bc9baa96d573cbab78 100644 (file)
--- a/package/opengl/libopenmax/Config.in
+++ b/package/opengl/libopenmax/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBOPENMAX
        bool
 
 config BR2_PACKAGE_PROVIDES_LIBOPENMAX
-       depends on BR2_PACKAGE_HAS_LIBOPENMAX
        string
+       depends on BR2_PACKAGE_HAS_LIBOPENMAX

diff --git a/package/opengl/libopenvg/Config.in b/package/opengl/libopenvg/Config.in
index 53cde6a88c2c207857212184462787db1815df1d..37d9410eb2ded943d9aa636346aecce9b1308c60 100644 (file)
--- a/package/opengl/libopenvg/Config.in
+++ b/package/opengl/libopenvg/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBOPENVG
        bool
 
 config BR2_PACKAGE_PROVIDES_LIBOPENVG
-       depends on BR2_PACKAGE_HAS_LIBOPENVG
        string
+       depends on BR2_PACKAGE_HAS_LIBOPENVG

diff --git a/package/openocd/Config.in b/package/openocd/Config.in
index 41c2fc56880ae96ae1f7664e2c06aabb85027cf1..6cba7a04c869741a481f63d33d6ae03fa1ae90ab 100644 (file)
--- a/package/openocd/Config.in
+++ b/package/openocd/Config.in
@@ -11,109 +11,109 @@ comment "Adapters"
 
 config BR2_PACKAGE_OPENOCD_FTDI
        bool "MPSSE mode of FTDI based devices"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the MPSSE mode of FTDI
          (FT2xxx/FT4xxx) based devices (default is auto)
 
 config BR2_PACKAGE_OPENOCD_STLINK
        bool "ST-Link JTAG Programmer"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the ST-Link JTAG
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_TI_ICDI
        bool "TI ICDI JTAG Programmer"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the TI ICDI JTAG
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_ULINK
        bool "Keil ULINK JTAG Programmer"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the Keil ULINK JTAG
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_UBLASTER2
        bool "Altera USB-Blaster II Compatible"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the Altera USB-Blaster
          II Compatible (default is auto)
 
 config BR2_PACKAGE_OPENOCD_JLINK
        bool "Segger J-Link JTAG Programmer"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Segger J-Link JTAG Programmer and clone such as Atmel
          SAM-ICE
 
 config BR2_PACKAGE_OPENOCD_OSDBM
        bool "OSDBM JTAG (only) Programmer"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the OSBDM (JTAG only)
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_OPENDOUS
        bool "eStick/opendous JTAG Programmer"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the eStick/opendous JTAG
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_AICE
        bool "Andes JTAG Programmer"
-       select BR2_PACKAGE_LIBUSB
        depends on BR2_USE_MMU # use fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+       select BR2_PACKAGE_LIBUSB
        help
          Enable building support for the Andes JTAG
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_VSLLINK
        bool "Versaloon-Link JTAG Programmer"
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        select BR2_PACKAGE_LIBUSB
        select BR2_PACKAGE_LIBUSB_COMPAT
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        help
          Enable building support for the Versaloon-Link JTAG
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_USBPROG
        bool "USBProg JTAG Programmer"
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        select BR2_PACKAGE_LIBUSB
        select BR2_PACKAGE_LIBUSB_COMPAT
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        help
          Enable building support for the USBProg JTAG
          Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_RLINK
        bool "Raisonance RLink JTAG Programmer"
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        select BR2_PACKAGE_LIBUSB
        select BR2_PACKAGE_LIBUSB_COMPAT
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        help
          Enable building support for the Raisonance RLink
          JTAG Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_ARMEW
        bool "Olimex ARM-JTAG-EW Programmer"
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        select BR2_PACKAGE_LIBUSB
        select BR2_PACKAGE_LIBUSB_COMPAT
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
        help
          Enable building support for the Olimex ARM-JTAG-EW
          Programmer (default is auto)
@@ -130,8 +130,8 @@ config BR2_PACKAGE_OPENOCD_VPI
 
 config BR2_PACKAGE_OPENOCD_UBLASTER
        bool "Altera USB-Blaster"
-       select BR2_PACKAGE_LIBFTDI1
        depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
+       select BR2_PACKAGE_LIBFTDI1
        help
          Enable building support for the Altera USB-Blaster
          using the libftdi driver, opensource alternate of
@@ -170,18 +170,18 @@ config BR2_PACKAGE_OPENOCD_GW16012
 
 config BR2_PACKAGE_OPENOCD_PRESTO
        bool "ASIX Presto Programmer"
-       select BR2_PACKAGE_LIBFTDI1
        depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
+       select BR2_PACKAGE_LIBFTDI1
        help
          Enable building support for ASIX Presto Programmer
          using the libftdi driver
 
 config BR2_PACKAGE_OPENOCD_OPENJTAG
        bool "OpenJTAG Programmer"
+       depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
        select BR2_PACKAGE_LIBFTDI1
        select BR2_PACKAGE_LIBUSB
        select BR2_PACKAGE_LIBUSB_COMPAT # needs usb.h
-       depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
        help
          Enable building support for the OpenJTAG Programmer
          with ftdi driver

diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in
index d5e976430fab72565b6dc382ec7f1751cce6f71a..68ea75195401aefe41e65e5b2e56be218559c74f 100644 (file)
--- a/package/openpowerlink/Config.in
+++ b/package/openpowerlink/Config.in
@@ -110,8 +110,8 @@ endmenu
 endif # BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB
 
 config BR2_PACKAGE_OPENPOWERLINK_KERNEL_PCIE_DRIVER
-       depends on BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB
        bool "PCIe Powerlink Driver"
+       depends on BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB
 
 menu "demos"
 

diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in
index 79c503cfb882218ab4d65cdcaac73a37a4799d46..f76bdf2d447a724db78bcfd5de827ea9d9fceb14 100644 (file)
--- a/package/openvmtools/Config.in
+++ b/package/openvmtools/Config.in
@@ -33,11 +33,11 @@ comment "procps support needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS"
 
 config BR2_PACKAGE_OPENVMTOOLS_PAM
        bool "PAM support"
-       select BR2_PACKAGE_LINUX_PAM
        # linux-pam needs locale and wchar, but we already have this
        # dependency on the main symbol, above.
        depends on !BR2_STATIC_LIBS
        depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
+       select BR2_PACKAGE_LINUX_PAM
        help
          Support for PAM in openvmtools
 

diff --git a/package/opkg/Config.in b/package/opkg/Config.in
index 5a4bbc2654f901fd951a4fd79fe9654213fb5991..a188a7bbff22632178f8b28fc49eab066c49a178 100644 (file)
--- a/package/opkg/Config.in
+++ b/package/opkg/Config.in
@@ -4,9 +4,9 @@ comment "opkg needs a toolchain w/ wchar"
 
 config BR2_PACKAGE_OPKG
        bool "opkg"
-       select BR2_PACKAGE_LIBARCHIVE
        depends on BR2_USE_MMU # fork()
        depends on BR2_USE_WCHAR # libarchive
+       select BR2_PACKAGE_LIBARCHIVE
        help
          Opkg is a lightweight package management system, based on ipkg. It is
          written in C and resembles apt/dpkg in operation. It is intended for

diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index e2adde5802cd8037aa87175b78592fd01909e585..d99a7e60c8e8f2ed80773f57c19b6d1c2a71a1f2 100644 (file)
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -15,14 +15,14 @@ config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
 config BR2_PACKAGE_OPROFILE
        bool "oprofile"
        depends on BR2_USE_MMU # fork()
-       select BR2_PACKAGE_POPT
-       select BR2_PACKAGE_BINUTILS
-       select BR2_PACKAGE_LIBPFM4 if BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR # binutils
        depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS
        # libpfm4 is needed on PowerPC, and requires thread support
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
+       select BR2_PACKAGE_POPT
+       select BR2_PACKAGE_BINUTILS
+       select BR2_PACKAGE_LIBPFM4 if BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
        help
          OProfile is a system-wide profiler for Linux systems,
          capable of profiling all running code at low overhead.