From 3483a98d01b319053bc1956aca25c658846c4ab5 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sat, 22 Apr 2017 13:18:01 -0400 Subject: [PATCH] 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 Signed-off-by: Thomas Petazzoni --- package/odroid-mali/Config.in | 4 ++-- package/on2-8170-libs/Config.in | 2 +- package/opencv/Config.in | 4 ++-- package/opencv3/Config.in | 2 +- package/opengl/libegl/Config.in | 2 +- package/opengl/libgl/Config.in | 2 +- package/opengl/libgles/Config.in | 2 +- package/opengl/libopenmax/Config.in | 2 +- package/opengl/libopenvg/Config.in | 2 +- package/openocd/Config.in | 32 ++++++++++++++--------------- package/openpowerlink/Config.in | 2 +- package/openvmtools/Config.in | 2 +- package/opkg/Config.in | 2 +- package/oprofile/Config.in | 6 +++--- 14 files changed, 33 insertions(+), 33 deletions(-) diff --git a/package/odroid-mali/Config.in b/package/odroid-mali/Config.in index e5c07f2378..1c31c2d0e3 100644 --- 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 40cad3d00c..2a60c581e4 100644 --- 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 c046baaa4b..0260851340 100644 --- 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 ee589f950f..3b0a9d60c9 100644 --- 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 f756fbeadf..a236998947 100644 --- 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 8b99e5bdd3..b9a1602a72 100644 --- 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 b7b800f3f2..090ef16d42 100644 --- 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 d50f2ced1f..901426abd6 100644 --- 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 53cde6a88c..37d9410eb2 100644 --- 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 41c2fc5688..6cba7a04c8 100644 --- 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 d5e976430f..68ea751954 100644 --- 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 79c503cfb8..f76bdf2d44 100644 --- 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 5a4bbc2654..a188a7bbff 100644 --- 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 e2adde5802..d99a7e60c8 100644 --- 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. -- 2.30.2