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>
This commit is contained in:
Adam Duskett 2017-04-22 13:18:01 -04:00 committed by Thomas Petazzoni
parent f998e0d092
commit 3483a98d01
14 changed files with 33 additions and 33 deletions

View file

@ -1,10 +1,10 @@
config BR2_PACKAGE_ODROID_MALI config BR2_PACKAGE_ODROID_MALI
bool "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_LIBEGL
select BR2_PACKAGE_HAS_LIBGLES select BR2_PACKAGE_HAS_LIBGLES
select BR2_PACKAGE_ODROID_SCRIPTS # runtime select BR2_PACKAGE_ODROID_SCRIPTS # runtime
depends on BR2_TOOLCHAIN_USES_GLIBC
depends on BR2_aarch64 || BR2_ARM_EABIHF
help help
Install the ARM Mali drivers for odroidc2 based systems. Install the ARM Mali drivers for odroidc2 based systems.

View file

@ -1,10 +1,10 @@
config BR2_PACKAGE_ON2_8170_LIBS config BR2_PACKAGE_ON2_8170_LIBS
bool "on2-8170-libs"
#This is a binary only package which has been compiled for glibc #This is a binary only package which has been compiled for glibc
depends on BR2_arm926t depends on BR2_arm926t
depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_USES_GLIBC
depends on BR2_LINUX_KERNEL # on2-8170-modules depends on BR2_LINUX_KERNEL # on2-8170-modules
select BR2_PACKAGE_ON2_8170_MODULES # runtime select BR2_PACKAGE_ON2_8170_MODULES # runtime
bool "on2-8170-libs"
help help
Libraries for Hantro X170 video decoder Libraries for Hantro X170 video decoder

View file

@ -1,9 +1,9 @@
menuconfig BR2_PACKAGE_OPENCV menuconfig BR2_PACKAGE_OPENCV
bool "opencv-2.4" bool "opencv-2.4"
select BR2_PACKAGE_ZLIB
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_ZLIB
help help
OpenCV (Open Source Computer Vision) is a library of programming OpenCV (Open Source Computer Vision) is a library of programming
functions for real time computer vision. functions for real time computer vision.
@ -52,13 +52,13 @@ config BR2_PACKAGE_OPENCV_LIB_FLANN
config BR2_PACKAGE_OPENCV_LIB_GPU config BR2_PACKAGE_OPENCV_LIB_GPU
bool "gpu" bool "gpu"
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto 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_CALIB3D
select BR2_PACKAGE_OPENCV_LIB_IMGPROC select BR2_PACKAGE_OPENCV_LIB_IMGPROC
select BR2_PACKAGE_OPENCV_LIB_LEGACY select BR2_PACKAGE_OPENCV_LIB_LEGACY
select BR2_PACKAGE_OPENCV_LIB_OBJDETECT select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
select BR2_PACKAGE_OPENCV_LIB_PHOTO select BR2_PACKAGE_OPENCV_LIB_PHOTO
select BR2_PACKAGE_OPENCV_LIB_VIDEO select BR2_PACKAGE_OPENCV_LIB_VIDEO
depends on !BR2_STATIC_LIBS
help help
Include opencv_gpu module into the OpenCV build. Include opencv_gpu module into the OpenCV build.

View file

@ -1,12 +1,12 @@
menuconfig BR2_PACKAGE_OPENCV3 menuconfig BR2_PACKAGE_OPENCV3
bool "opencv3" bool "opencv3"
select BR2_PACKAGE_ZLIB
depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on !BR2_STATIC_LIBS # include dlfcn.h depends on !BR2_STATIC_LIBS # include dlfcn.h
depends on !BR2_PACKAGE_OPENCV depends on !BR2_PACKAGE_OPENCV
select BR2_PACKAGE_ZLIB
help help
OpenCV (Open Source Computer Vision) is a library of programming OpenCV (Open Source Computer Vision) is a library of programming
functions for real time computer vision. functions for real time computer vision.

View file

@ -6,5 +6,5 @@ config BR2_PACKAGE_HAS_LIBEGL_WAYLAND
depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_HAS_LIBEGL
config BR2_PACKAGE_PROVIDES_LIBEGL config BR2_PACKAGE_PROVIDES_LIBEGL
depends on BR2_PACKAGE_HAS_LIBEGL
string string
depends on BR2_PACKAGE_HAS_LIBEGL

View file

@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBGL
bool bool
config BR2_PACKAGE_PROVIDES_LIBGL config BR2_PACKAGE_PROVIDES_LIBGL
depends on BR2_PACKAGE_HAS_LIBGL
string string
depends on BR2_PACKAGE_HAS_LIBGL

View file

@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBGLES
bool bool
config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_LIBGLES
depends on BR2_PACKAGE_HAS_LIBGLES
string string
depends on BR2_PACKAGE_HAS_LIBGLES

View file

@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBOPENMAX
bool bool
config BR2_PACKAGE_PROVIDES_LIBOPENMAX config BR2_PACKAGE_PROVIDES_LIBOPENMAX
depends on BR2_PACKAGE_HAS_LIBOPENMAX
string string
depends on BR2_PACKAGE_HAS_LIBOPENMAX

View file

@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBOPENVG
bool bool
config BR2_PACKAGE_PROVIDES_LIBOPENVG config BR2_PACKAGE_PROVIDES_LIBOPENVG
depends on BR2_PACKAGE_HAS_LIBOPENVG
string string
depends on BR2_PACKAGE_HAS_LIBOPENVG

View file

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

View file

@ -110,8 +110,8 @@ endmenu
endif # BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB endif # BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB
config BR2_PACKAGE_OPENPOWERLINK_KERNEL_PCIE_DRIVER config BR2_PACKAGE_OPENPOWERLINK_KERNEL_PCIE_DRIVER
depends on BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB
bool "PCIe Powerlink Driver" bool "PCIe Powerlink Driver"
depends on BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB
menu "demos" menu "demos"

View file

@ -33,11 +33,11 @@ comment "procps support needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS"
config BR2_PACKAGE_OPENVMTOOLS_PAM config BR2_PACKAGE_OPENVMTOOLS_PAM
bool "PAM support" bool "PAM support"
select BR2_PACKAGE_LINUX_PAM
# linux-pam needs locale and wchar, but we already have this # linux-pam needs locale and wchar, but we already have this
# dependency on the main symbol, above. # dependency on the main symbol, above.
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
select BR2_PACKAGE_LINUX_PAM
help help
Support for PAM in openvmtools Support for PAM in openvmtools

View file

@ -4,9 +4,9 @@ comment "opkg needs a toolchain w/ wchar"
config BR2_PACKAGE_OPKG config BR2_PACKAGE_OPKG
bool "opkg" bool "opkg"
select BR2_PACKAGE_LIBARCHIVE
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR # libarchive depends on BR2_USE_WCHAR # libarchive
select BR2_PACKAGE_LIBARCHIVE
help help
Opkg is a lightweight package management system, based on ipkg. It is 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 written in C and resembles apt/dpkg in operation. It is intended for

View file

@ -15,14 +15,14 @@ config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
config BR2_PACKAGE_OPROFILE config BR2_PACKAGE_OPROFILE
bool "oprofile" bool "oprofile"
depends on BR2_USE_MMU # fork() 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_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR # binutils depends on BR2_USE_WCHAR # binutils
depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS
# libpfm4 is needed on PowerPC, and requires thread support # libpfm4 is needed on PowerPC, and requires thread support
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 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 help
OProfile is a system-wide profiler for Linux systems, OProfile is a system-wide profiler for Linux systems,
capable of profiling all running code at low overhead. capable of profiling all running code at low overhead.