build: consistently use 'depends on' instead of 'depends'
authorFelix Fietkau <nbd@openwrt.org>
Wed, 17 Apr 2013 15:36:41 +0000 (15:36 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 17 Apr 2013 15:36:41 +0000 (15:36 +0000)
make the syntax more compatible with kernel menuconfig

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36351

21 files changed:
Config.in
package/libs/libpcap/Config.in
package/libs/openssl/Config.in
package/mac80211/Makefile
package/network/services/hostapd/Config.in
package/network/services/samba36/Makefile
package/system/mmc_over_gpio/Makefile
package/toolchain/Makefile
scripts/metadata.pl
target/Config.in
target/imagebuilder/Config.in
target/linux/at91/image/Config.in
target/linux/avr32/image/Config.in
target/linux/brcm2708/image/Config.in
target/linux/x86/image/Config.in
target/sdk/Config.in
target/toolchain/Config.in
toolchain/Config.in
toolchain/binutils/Config.in
toolchain/eglibc/Config.in
toolchain/gcc/Config.in

index 98786fcdb1e6b9258ed38e3cfb0ce54132cbef82..115348071097052a61878be3a454f08efb99de6d 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -25,7 +25,7 @@ menu "Target Images"
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_NONE
-                       depends TARGET_ROOTFS_INITRAMFS
+                       depends on TARGET_ROOTFS_INITRAMFS
                        help
                          Select ramdisk compression.
 
                        help
                          Select ramdisk compression.
 
@@ -74,7 +74,7 @@ menu "Target Images"
        config TARGET_ROOTFS_EXT4FS
                bool "ext4"
                default y if USES_EXT4
        config TARGET_ROOTFS_EXT4FS
                bool "ext4"
                default y if USES_EXT4
-               depends !TARGET_ROOTFS_INITRAMFS
+               depends on !TARGET_ROOTFS_INITRAMFS
                help
                  Ext4 file system with some free space for uml images
 
                help
                  Ext4 file system with some free space for uml images
 
@@ -82,28 +82,28 @@ menu "Target Images"
                bool "iso"
                default n
                depends on TARGET_x86_generic
                bool "iso"
                default n
                depends on TARGET_x86_generic
-               depends !TARGET_ROOTFS_INITRAMFS
+               depends on !TARGET_ROOTFS_INITRAMFS
                help
                  Create some bootable ISO image
 
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                default y if USES_JFFS2
                help
                  Create some bootable ISO image
 
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                default y if USES_JFFS2
-               depends !TARGET_ROOTFS_INITRAMFS
+               depends on !TARGET_ROOTFS_INITRAMFS
                help
                  Build a jffs2 root filesystem
 
        config TARGET_ROOTFS_SQUASHFS
                bool "squashfs"
                default y if USES_SQUASHFS
                help
                  Build a jffs2 root filesystem
 
        config TARGET_ROOTFS_SQUASHFS
                bool "squashfs"
                default y if USES_SQUASHFS
-               depends !TARGET_ROOTFS_INITRAMFS
+               depends on !TARGET_ROOTFS_INITRAMFS
                help
                  Build a squashfs-lzma root filesystem
 
        config TARGET_ROOTFS_UBIFS
                bool "ubifs"
                default y if USES_UBIFS
                help
                  Build a squashfs-lzma root filesystem
 
        config TARGET_ROOTFS_UBIFS
                bool "ubifs"
                default y if USES_UBIFS
-               depends !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+               depends on !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
                help
                  Build a ubifs root filesystem
 
                help
                  Build a ubifs root filesystem
 
@@ -113,21 +113,21 @@ menu "Target Images"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
-               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
+               depends on X86_GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
                default 48
                help
                    Allows you to change the root filesystem partition size
 
        config TARGET_ROOTFS_MAXINODE
                int "Maximum number of inodes in root filesystem"
                default 48
                help
                    Allows you to change the root filesystem partition size
 
        config TARGET_ROOTFS_MAXINODE
                int "Maximum number of inodes in root filesystem"
-               depends TARGET_ROOTFS_EXT4FS
+               depends on TARGET_ROOTFS_EXT4FS
                default 6000
                help
                    Allows you to change the maximum number of inodes in the root filesystem
 
        config TARGET_ROOTFS_RESERVED_PCT
                int "Percentage of reserved blocks in root filesystem"
                default 6000
                help
                    Allows you to change the maximum number of inodes in the root filesystem
 
        config TARGET_ROOTFS_RESERVED_PCT
                int "Percentage of reserved blocks in root filesystem"
-               depends TARGET_ROOTFS_EXT4FS
+               depends on TARGET_ROOTFS_EXT4FS
                default 0
                help
                    Allows you to change the percentage of reserved blocks in the root filesystem
                default 0
                help
                    Allows you to change the percentage of reserved blocks in the root filesystem
@@ -303,90 +303,90 @@ menu "Global build settings"
        config KERNEL_FREEZER
                bool
                default y if KERNEL_CGROUP_FREEZER
        config KERNEL_FREEZER
                bool
                default y if KERNEL_CGROUP_FREEZER
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_FREEZER
                bool
 
        config KERNEL_CGROUP_FREEZER
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_DEVICE
                bool
 
        config KERNEL_CGROUP_DEVICE
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CPUSETS
                bool
                default y if KERNEL_CGROUP_CPUACCT
 
        config KERNEL_CPUSETS
                bool
                default y if KERNEL_CGROUP_CPUACCT
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_PROC_PID_CPUSET
                bool
                default y if KERNEL_CGROUP_CPUACCT
 
        config KERNEL_PROC_PID_CPUSET
                bool
                default y if KERNEL_CGROUP_CPUACCT
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_CPUACCT
                bool
 
        config KERNEL_CGROUP_CPUACCT
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_RESOURCE_COUNTERS
                bool
                default y if KERNEL_CGROUP_MEM_RES_CTLR
 
        config KERNEL_RESOURCE_COUNTERS
                bool
                default y if KERNEL_CGROUP_MEM_RES_CTLR
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_MEM_RES_CTLR
                bool
 
        config KERNEL_CGROUP_MEM_RES_CTLR
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_MEM_RES_CTLR_SWAP
                bool
 
        config KERNEL_CGROUP_MEM_RES_CTLR_SWAP
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_MEM_RES_CTLR_SWAP_ENABLED
                bool
 
        config KERNEL_CGROUP_MEM_RES_CTLR_SWAP_ENABLED
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_MEM_RES_CTLR_KMEM
                bool
 
        config KERNEL_CGROUP_MEM_RES_CTLR_KMEM
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUP_PERF
                bool
 
        config KERNEL_CGROUP_PERF
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CFS_BANDWIDTH
                bool
                default y if KERNEL_FAIR_GROUP_SCHED
 
        config KERNEL_CFS_BANDWIDTH
                bool
                default y if KERNEL_FAIR_GROUP_SCHED
-               depends KERNEL_CGROUP_SCHED
+               depends on KERNEL_CGROUP_SCHED
 
        config KERNEL_FAIR_GROUP_SCHED
                bool
                default y if KERNEL_CGROUP_SCHED
 
        config KERNEL_FAIR_GROUP_SCHED
                bool
                default y if KERNEL_CGROUP_SCHED
-               depends KERNEL_CGROUP_SCHED
+               depends on KERNEL_CGROUP_SCHED
 
        config KERNEL_RT_GROUP_SCHED
                bool
                default y if KERNEL_CGROUP_SCHED
 
        config KERNEL_RT_GROUP_SCHED
                bool
                default y if KERNEL_CGROUP_SCHED
-               depends KERNEL_CGROUP_SCHED
+               depends on KERNEL_CGROUP_SCHED
 
        config KERNEL_CGROUP_SCHED
                bool
 
        config KERNEL_CGROUP_SCHED
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_NET_CLS_CGROUP
                bool
 
        config KERNEL_NET_CLS_CGROUP
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_NETPRIO_CGROUP
                bool
 
        config KERNEL_NETPRIO_CGROUP
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_BLK_CGROUP
                bool
 
        config KERNEL_BLK_CGROUP
                bool
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_DEBUG_BLK_CGROUP
                bool
                default n if KERNEL_CGROUPS
 
        config KERNEL_DEBUG_BLK_CGROUP
                bool
                default n if KERNEL_CGROUPS
-               depends KERNEL_CGROUPS
+               depends on KERNEL_CGROUPS
 
        config KERNEL_CGROUPS
                bool "Enable kernel cgroups"
 
        config KERNEL_CGROUPS
                bool "Enable kernel cgroups"
@@ -410,27 +410,27 @@ menu "Global build settings"
 
        config KERNEL_UTS_NS
                bool
 
        config KERNEL_UTS_NS
                bool
-               depends KERNEL_NAMESPACES
+               depends on KERNEL_NAMESPACES
 
        config KERNEL_IPC_NS
                bool
 
        config KERNEL_IPC_NS
                bool
-               depends KERNEL_NAMESPACES
+               depends on KERNEL_NAMESPACES
 
        config KERNEL_USER_NS
                bool
 
        config KERNEL_USER_NS
                bool
-               depends KERNEL_NAMESPACES
+               depends on KERNEL_NAMESPACES
 
        config KERNEL_PID_NS
                bool
 
        config KERNEL_PID_NS
                bool
-               depends KERNEL_NAMESPACES
+               depends on KERNEL_NAMESPACES
 
        config KERNEL_NET_NS
                bool
 
        config KERNEL_NET_NS
                bool
-               depends KERNEL_NAMESPACES
+               depends on KERNEL_NAMESPACES
 
        config KERNEL_DEVPTS_MULTIPLE_INSTANCES
                bool
 
        config KERNEL_DEVPTS_MULTIPLE_INSTANCES
                bool
-               depends KERNEL_NAMESPACES
+               depends on KERNEL_NAMESPACES
 
        config KERNEL_NAMESPACES
                bool "Enable kernel namespaces"
 
        config KERNEL_NAMESPACES
                bool "Enable kernel namespaces"
@@ -536,9 +536,9 @@ menu "Global build settings"
 
                config USE_SSTRIP
                        bool "sstrip"
 
                config USE_SSTRIP
                        bool "sstrip"
-                       depends !DEBUG
-                       depends !USE_GLIBC
-                       depends !USE_EGLIBC
+                       depends on !DEBUG
+                       depends on !USE_GLIBC
+                       depends on !USE_EGLIBC
                        help
                          This will install binaries stripped using sstrip
        endchoice
                        help
                          This will install binaries stripped using sstrip
        endchoice
@@ -546,7 +546,7 @@ menu "Global build settings"
        config STRIP_ARGS
                string
                prompt "Strip arguments"
        config STRIP_ARGS
                string
                prompt "Strip arguments"
-               depends USE_STRIP
+               depends on USE_STRIP
                default "--strip-unneeded --remove-section=.comment --remove-section=.note" if DEBUG
                default "--strip-all"
                help
                default "--strip-unneeded --remove-section=.comment --remove-section=.note" if DEBUG
                default "--strip-all"
                help
index ef32c1bc0878d043117169f892f0fe875edd028d..5fee75a59597d5e60f9d156d3438d6fe504ae139 100644 (file)
@@ -1,15 +1,15 @@
 menu "Configuration"
 menu "Configuration"
-       depends PACKAGE_libpcap
+       depends on PACKAGE_libpcap
 
 config PCAP_HAS_USB
        bool "Include USB support"
 
 config PCAP_HAS_USB
        bool "Include USB support"
-       depends PACKAGE_kmod-usb-core
+       depends on PACKAGE_kmod-usb-core
        default n
 
 config PCAP_HAS_BT
        bool "Include bluetooth support"
        default n
 
 config PCAP_HAS_BT
        bool "Include bluetooth support"
-       depends PACKAGE_kmod-bluetooth
-       depends BROKEN
+       depends on PACKAGE_kmod-bluetooth
+       depends on BROKEN
        default n
 
 endmenu
        default n
 
 endmenu
index 11591de0476d9c596ff748e8271af7408dc0aa8a..70d520cd1c7c9c85ad63b7cfa2136a1193c33013 100644 (file)
@@ -7,7 +7,7 @@ config OPENSSL_ENGINE_CRYPTO
 
 config OPENSSL_ENGINE_DIGEST
        bool
 
 config OPENSSL_ENGINE_DIGEST
        bool
-       depends OPENSSL_ENGINE_CRYPTO
+       depends on OPENSSL_ENGINE_CRYPTO
        prompt "Digests acceleration support"
 
 endmenu
        prompt "Digests acceleration support"
 
 endmenu
index 852fb0e52f40488caaf546b5da3ac6d6b1cf5f9a..6d5ca077452fc277ebb07983a5b1d6efbf8ff2c0 100644 (file)
@@ -221,7 +221,7 @@ define KernelPackage/rt2x00-lib/config
 
        config PACKAGE_RT2X00_LIB_DEBUGFS
                bool "Enable rt2x00 debugfs support"
 
        config PACKAGE_RT2X00_LIB_DEBUGFS
                bool "Enable rt2x00 debugfs support"
-               depends PACKAGE_MAC80211_DEBUGFS
+               depends on PACKAGE_MAC80211_DEBUGFS
                help
                  Enable creation of debugfs files for the rt2x00 drivers.
                  These debugfs files support both reading and writing of the
                help
                  Enable creation of debugfs files for the rt2x00 drivers.
                  These debugfs files support both reading and writing of the
index 810c5a09a9499d325faaa389a9fd90fcbb3f0cf6..b39be38fd05270515003d3b99ba47be4c60a293b 100644 (file)
@@ -1,7 +1,7 @@
 # wpa_supplicant config
 config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
        bool "Disable timestamp check"
 # wpa_supplicant config
 config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
        bool "Disable timestamp check"
-       depends PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
+       depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
        default n
        help
          This disables the timestamp check for certificates in wpa_supplicant
        default n
        help
          This disables the timestamp check for certificates in wpa_supplicant
@@ -10,7 +10,7 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
 choice
        prompt "Choose TLS provider"
        default WPA_SUPPLICANT_INTERNAL
 choice
        prompt "Choose TLS provider"
        default WPA_SUPPLICANT_INTERNAL
-       depends PACKAGE_wpa-supplicant || PACKAGE_wpad
+       depends on PACKAGE_wpa-supplicant || PACKAGE_wpad
 
 config WPA_SUPPLICANT_INTERNAL
        bool "internal"
 
 config WPA_SUPPLICANT_INTERNAL
        bool "internal"
@@ -23,7 +23,7 @@ endchoice
 
 config WPA_RFKILL_SUPPORT
        bool "Add rfkill support"
 
 config WPA_RFKILL_SUPPORT
        bool "Add rfkill support"
-       depends PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
+       depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
        default n
 
 config WPA_MSG_MIN_PRIORITY
        default n
 
 config WPA_MSG_MIN_PRIORITY
index 2842c982bf547e6420e413ca6791943497fa4419..2644f7d565563fb31ab4d6ccc0aa8aff840f9da0 100644 (file)
@@ -49,7 +49,7 @@ endef
 define Package/samba36-server/config
        config PACKAGE_SAMBA_MAX_DEBUG_LEVEL
                int "Maximum level of compiled-in debug messages"
 define Package/samba36-server/config
        config PACKAGE_SAMBA_MAX_DEBUG_LEVEL
                int "Maximum level of compiled-in debug messages"
-               depends PACKAGE_samba36-server || PACKAGE_samba36-client
+               depends on PACKAGE_samba36-server || PACKAGE_samba36-client
                default -1
 
 endef
                default -1
 
 endef
index 8525887dd2c4fbc1ded604dfcfb73bd36b33c0ed..62d0ba5b7da787087c32aebee68872ef58009ab2 100644 (file)
@@ -25,7 +25,7 @@ endef
 
 define Package/kmod-mmc-over-gpio/config
        menu "Configuration"
 
 define Package/kmod-mmc-over-gpio/config
        menu "Configuration"
-               depends PACKAGE_kmod-mmc-over-gpio
+               depends on PACKAGE_kmod-mmc-over-gpio
 
        config KMOD_MMC_OVER_GPIO_DI_PIN
                int "GPIO DI (Data-In) pin"
 
        config KMOD_MMC_OVER_GPIO_DI_PIN
                int "GPIO DI (Data-In) pin"
index b9d582ee4dcb6663acca76e64b6e8d790c358bd2..7eadaba0d4f9a794fd02c149768e298025bbee0a 100644 (file)
@@ -34,19 +34,19 @@ endef
 
 define Package/libgcc/config
        menu "Configuration"
 
 define Package/libgcc/config
        menu "Configuration"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
 
        config LIBGCC_ROOT_DIR
                string
                prompt "libgcc shared library base directory"
 
        config LIBGCC_ROOT_DIR
                string
                prompt "libgcc shared library base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBGCC_FILE_SPEC
                string
                prompt "libgcc shared library files (use wildcards)"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBGCC_FILE_SPEC
                string
                prompt "libgcc shared library files (use wildcards)"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
                default "./lib/libgcc_s.so.*"
 
        endmenu
                default "./lib/libgcc_s.so.*"
 
        endmenu
@@ -61,19 +61,19 @@ endef
 
 define Package/libssp/config
        menu "Configuration"
 
 define Package/libssp/config
        menu "Configuration"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
 
        config LIBSSP_ROOT_DIR
                string
                prompt "libssp shared library base directory"
 
        config LIBSSP_ROOT_DIR
                string
                prompt "libssp shared library base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBSSP_FILE_SPEC
                string
                prompt "libssp shared library files (use wildcards)"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBSSP_FILE_SPEC
                string
                prompt "libssp shared library files (use wildcards)"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
                default "./lib/libssp.so.*"
 
        endmenu
                default "./lib/libssp.so.*"
 
        endmenu
@@ -89,19 +89,19 @@ endef
 
 define Package/libstdcpp/config
        menu "Configuration"
 
 define Package/libstdcpp/config
        menu "Configuration"
-       depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+       depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
 
        config LIBSTDCPP_ROOT_DIR
                string
                prompt "libstdcpp shared library base directory"
 
        config LIBSTDCPP_ROOT_DIR
                string
                prompt "libstdcpp shared library base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBSTDCPP_FILE_SPEC
                string
                prompt "libstdc++ shared library files (use wildcards)"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBSTDCPP_FILE_SPEC
                string
                prompt "libstdc++ shared library files (use wildcards)"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
                default "./lib/libstdc++.so.*"
 
        endmenu
                default "./lib/libstdc++.so.*"
 
        endmenu
@@ -125,19 +125,19 @@ endef
 
 define Package/libc/config
        menu "Configuration"
 
 define Package/libc/config
        menu "Configuration"
-       depends EXTERNAL_TOOLCHAIN && PACKAGE_libc
+       depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc
 
        config LIBC_ROOT_DIR
                string
                prompt "libc shared library base directory"
 
        config LIBC_ROOT_DIR
                string
                prompt "libc shared library base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libc
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBC_FILE_SPEC
                string
                prompt "libc shared library files (use wildcards)"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBC_FILE_SPEC
                string
                prompt "libc shared library files (use wildcards)"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libc
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc
                default "./lib/ld{-*.so,-linux*.so.*} ./lib/lib{anl,c,cidn,crypt,dl,m,nsl,nss_dns,nss_files,resolv,util}{-*.so,.so.*}"
 
        endmenu
                default "./lib/ld{-*.so,-linux*.so.*} ./lib/lib{anl,c,cidn,crypt,dl,m,nsl,nss_dns,nss_files,resolv,util}{-*.so,.so.*}"
 
        endmenu
@@ -151,19 +151,19 @@ endef
 
 define Package/libpthread/config
        menu "Configuration"
 
 define Package/libpthread/config
        menu "Configuration"
-       depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+       depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
 
        config LIBPTHREAD_ROOT_DIR
                string
                prompt "libpthread shared library base directory"
 
        config LIBPTHREAD_ROOT_DIR
                string
                prompt "libpthread shared library base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBPTHREAD_FILE_SPEC
                string
                prompt "libpthread shared library files (use wildcards)"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBPTHREAD_FILE_SPEC
                string
                prompt "libpthread shared library files (use wildcards)"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
                default "./lib/libpthread{-*.so,.so.*}"
 
        endmenu
                default "./lib/libpthread{-*.so,.so.*}"
 
        endmenu
@@ -184,19 +184,19 @@ endef
 
 define Package/librt/config
        menu "Configuration"
 
 define Package/librt/config
        menu "Configuration"
-       depends EXTERNAL_TOOLCHAIN && PACKAGE_librt
+       depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt
 
        config LIBRT_ROOT_DIR
                string
                prompt "librt shared library base directory"
 
        config LIBRT_ROOT_DIR
                string
                prompt "librt shared library base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_librt
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBRT_FILE_SPEC
                string
                prompt "librt shared library files (use wildcards)"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBRT_FILE_SPEC
                string
                prompt "librt shared library files (use wildcards)"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_librt
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt
                default "./lib/librt{-*.so,.so.*}"
 
        endmenu
                default "./lib/librt{-*.so,.so.*}"
 
        endmenu
@@ -211,19 +211,19 @@ endef
 
 define Package/libgfortran/config
        menu "Configuration"
 
 define Package/libgfortran/config
        menu "Configuration"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
 
        config LIBGFORTRAN_ROOT_DIR
                string
                prompt "libgfortran shared library base directory"
 
        config LIBGFORTRAN_ROOT_DIR
                string
                prompt "libgfortran shared library base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBGFORTRAN_FILE_SPEC
                string
                prompt "libgfortran shared library files (use wildcards)"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LIBGFORTRAN_FILE_SPEC
                string
                prompt "libgfortran shared library files (use wildcards)"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
                default "./usr/lib/libgfortran.so.*"
 
        endmenu
                default "./usr/lib/libgfortran.so.*"
 
        endmenu
@@ -239,19 +239,19 @@ endef
 
 define Package/ldd/config
        menu "Configuration"
 
 define Package/ldd/config
        menu "Configuration"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd
 
        config LDD_ROOT_DIR
                string
                prompt "ldd trace utility base directory"
 
        config LDD_ROOT_DIR
                string
                prompt "ldd trace utility base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LDD_FILE_SPEC
                string
                prompt "ldd trace utility file"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LDD_FILE_SPEC
                string
                prompt "ldd trace utility file"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd
                default "./usr/bin/ldd"
 
        endmenu
                default "./usr/bin/ldd"
 
        endmenu
@@ -268,19 +268,19 @@ endef
 
 define Package/ldconfig/config
        menu "Configuration"
 
 define Package/ldconfig/config
        menu "Configuration"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
 
        config LDCONFIG_ROOT_DIR
                string
                prompt "ldconfig base directory"
 
        config LDCONFIG_ROOT_DIR
                string
                prompt "ldconfig base directory"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LDCONFIG_FILE_SPEC
                string
                prompt "ldconfig file"
                default TOOLCHAIN_ROOT  if !NATIVE_TOOLCHAIN
                default "/"  if NATIVE_TOOLCHAIN
 
        config LDCONFIG_FILE_SPEC
                string
                prompt "ldconfig file"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
                default "./sbin/ldconfig"
 
        endmenu
                default "./sbin/ldconfig"
 
        endmenu
index 6249127e3ddfc158626a8e1ab8f7adf91221e2e9..b0abd78a0c415b935b293ec763210bafc55bffee 100755 (executable)
@@ -153,7 +153,7 @@ sub target_config_features(@) {
        my $ret;
 
        while ($_ = shift @_) {
        my $ret;
 
        while ($_ = shift @_) {
-               /broken/ and $ret .= "\tdepends BROKEN\n";
+               /broken/ and $ret .= "\tdepends on BROKEN\n";
                /audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
                /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
                /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
                /audio/ and $ret .= "\tselect AUDIO_SUPPORT\n";
                /display/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
                /gpio/ and $ret .= "\tselect GPIO_SUPPORT\n";
@@ -230,11 +230,11 @@ config TARGET_$target->{conf}
 EOF
        }
        if ($target->{subtarget}) {
 EOF
        }
        if ($target->{subtarget}) {
-               $confstr .= "\tdepends TARGET_$target->{boardconf}\n";
+               $confstr .= "\tdepends on TARGET_$target->{boardconf}\n";
        }
        if (@{$target->{subtargets}} > 0) {
                $confstr .= "\tselect HAS_SUBTARGETS\n";
        }
        if (@{$target->{subtargets}} > 0) {
                $confstr .= "\tselect HAS_SUBTARGETS\n";
-               grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends BROKEN\n";
+               grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends on BROKEN\n";
        } else {
                $confstr .= $features;
        }
        } else {
                $confstr .= $features;
        }
@@ -243,7 +243,7 @@ EOF
                $confstr .= "\tselect $target->{arch}\n";
        }
        foreach my $dep (@{$target->{depends}}) {
                $confstr .= "\tselect $target->{arch}\n";
        }
        foreach my $dep (@{$target->{depends}}) {
-               my $mode = "depends";
+               my $mode = "depends on";
                my $flags;
                my $name;
 
                my $flags;
                my $name;
 
@@ -317,7 +317,7 @@ EOF
                        print <<EOF;
 config TARGET_$target->{conf}_$profile->{id}
        bool "$profile->{name}"
                        print <<EOF;
 config TARGET_$target->{conf}_$profile->{id}
        bool "$profile->{name}"
-       depends TARGET_$target->{conf}
+       depends on TARGET_$target->{conf}
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
 $profile->{config}
 EOF
                        $profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
@@ -443,7 +443,7 @@ sub mconf_depends {
        $depends or return;
        my @depends = @$depends;
        foreach my $depend (@depends) {
        $depends or return;
        my @depends = @$depends;
        foreach my $depend (@depends) {
-               my $m = "depends";
+               my $m = "depends on";
                my $flags = "";
                $depend =~ s/^([@\+]+)// and $flags = $1;
                my $vdep;
                my $flags = "";
                $depend =~ s/^([@\+]+)// and $flags = $1;
                my $vdep;
@@ -602,7 +602,7 @@ sub gen_package_config() {
                        print <<EOF
        config UCI_PRECONFIG_$conf
                string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
                        print <<EOF
        config UCI_PRECONFIG_$conf
                string "$preconfig{$preconfig}->{$cfg}->{label}" if IMAGEOPT
-               depends PACKAGE_$preconfig
+               depends on PACKAGE_$preconfig
                default "$preconfig{$preconfig}->{$cfg}->{default}"
 
 EOF
                default "$preconfig{$preconfig}->{$cfg}->{default}"
 
 EOF
index 8ff89ff8a9abfa81f410eb556f106b455c9f6940..967149d435b75cd6cf2f0e59b073e8a2f6647b3a 100644 (file)
@@ -3,7 +3,7 @@ source "tmp/.config-target.in"
 # Kernel/Hardware features
 
 config HAS_SPE_FPU
 # Kernel/Hardware features
 
 config HAS_SPE_FPU
-       depends powerpc
+       depends on powerpc
        select HAS_FPU
        bool
 
        select HAS_FPU
        bool
 
@@ -67,7 +67,7 @@ config NOMMU
        bool
 
 config HAS_MIPS16
        bool
 
 config HAS_MIPS16
-       depends (mips || mipsel || mips64 || mips64el)
+       depends on (mips || mipsel || mips64 || mips64el)
        bool
 
 config ARCH_64BIT
        bool
 
 config ARCH_64BIT
index 23a418bf5178d7a7b45ecbb13d9a1a4781f2d0c8..d3bc72940545c5bb81292fa6b2ce7e8c863133fa 100644 (file)
@@ -1,8 +1,8 @@
 config IB
        bool "Build the OpenWrt Image Builder"
 config IB
        bool "Build the OpenWrt Image Builder"
-       depends !TARGET_ROOTFS_INITRAMFS
-       depends !PROFILE_KCONFIG
-       depends !EXTERNAL_TOOLCHAIN
+       depends on !TARGET_ROOTFS_INITRAMFS
+       depends on !PROFILE_KCONFIG
+       depends on !EXTERNAL_TOOLCHAIN
        help
          This is essentially a stripped-down version of the buildroot
          with precompiled packages, kernel image and image building tools.
        help
          This is essentially a stripped-down version of the buildroot
          with precompiled packages, kernel image and image building tools.
index 917398f2698824a42d0dd775c1333bdb45ba4b4c..54a501dcb30d9ccf97dc8118fb4532808d35761a 100644 (file)
@@ -1,16 +1,16 @@
 config AT91_DFBOOT
        bool "Build dataflashboot loader"
 config AT91_DFBOOT
        bool "Build dataflashboot loader"
-       depends TARGET_at91
+       depends on TARGET_at91
        default n
 
 config AT91_UBOOT
        bool "Build U-Boot bootloader"
        default n
 
 config AT91_UBOOT
        bool "Build U-Boot bootloader"
-       depends TARGET_at91
+       depends on TARGET_at91
        default n
 
 config UBOOT_TARGET
        string "U-Boot target board"
        default n
 
 config UBOOT_TARGET
        string "U-Boot target board"
-       depends AT91_UBOOT
+       depends on AT91_UBOOT
        default "netusg20"
        help
          For all supported boards there are ready-to-use default
        default "netusg20"
        help
          For all supported boards there are ready-to-use default
@@ -18,20 +18,20 @@ config UBOOT_TARGET
 
 config UBOOT_IPADDR
        string "IP Address for U-Boot"
 
 config UBOOT_IPADDR
        string "IP Address for U-Boot"
-       depends AT91_UBOOT
+       depends on AT91_UBOOT
        default "192.168.0.178"
        help
          IP address of device to be used in U-Boot
 
 config UBOOT_SERVERIP
        string "IP Address of TFTP server"
        default "192.168.0.178"
        help
          IP address of device to be used in U-Boot
 
 config UBOOT_SERVERIP
        string "IP Address of TFTP server"
-       depends AT91_UBOOT
+       depends on AT91_UBOOT
        default "192.168.0.232"
        help
          IP address of TFTP server for U-Boot
 
 config FLEXIBITY_ROOT
        bool "Build Flexibity RootFS (with embedded kernel)"
        default "192.168.0.232"
        help
          IP address of TFTP server for U-Boot
 
 config FLEXIBITY_ROOT
        bool "Build Flexibity RootFS (with embedded kernel)"
-       depends TARGET_at91_flexibity
+       depends on TARGET_at91_flexibity
        default n
 
        default n
 
index bc5469e7a8e0a4d0e63080753ef18f4a819e438c..7448a0f2116da316c18a8107314c92b9be29588a 100644 (file)
@@ -1,12 +1,12 @@
 config AVR32_UBOOT
        bool "Build U-Boot bootloader"
 config AVR32_UBOOT
        bool "Build U-Boot bootloader"
-       depends TARGET_avr32
+       depends on TARGET_avr32
        default n
 
 config AVR32_UBOOT_TARGET
        string "U-Boot target board"
        default n
 
 config AVR32_UBOOT_TARGET
        string "U-Boot target board"
-       depends TARGET_avr32
-       depends AVR32_UBOOT
+       depends on TARGET_avr32
+       depends on AVR32_UBOOT
        default "atngw100"
        help
          For all supported boards there are ready-to-use default
        default "atngw100"
        help
          For all supported boards there are ready-to-use default
index b9bea86479b33347d9f8808430baf6c4d9c1a437..f7abd9d39db6297c9f9a6557e813bca8f88ba843 100644 (file)
@@ -1,5 +1,5 @@
 config BRCM2708_SD_BOOT_PARTSIZE
        int "Boot (SD Card) filesystem partition size (in MB)"
 config BRCM2708_SD_BOOT_PARTSIZE
        int "Boot (SD Card) filesystem partition size (in MB)"
-       depends TARGET_brcm2708
+       depends on TARGET_brcm2708
        default 20
 
        default 20
 
index 9ced34c93ecc50d10a927dbf8f2cda6d51952c85..d7b5e90d1eeeab84129f7b9be84405cefd1fa41f 100644 (file)
@@ -1,13 +1,13 @@
 config X86_ETHERBOOT_IMAGES
        bool "Build Etherboot image"
 config X86_ETHERBOOT_IMAGES
        bool "Build Etherboot image"
-       depends TARGET_x86 && TARGET_x86_thincan_DBE61
+       depends on TARGET_x86 && TARGET_x86_thincan_DBE61
        default y
        help
          Builds network bootable image for ThinCan DBE61 (Etherboot BIOS)
 
 config X86_ETHERBOOT_BOOTOPTS
        string "Extra kernel boot options"
        default y
        help
          Builds network bootable image for ThinCan DBE61 (Etherboot BIOS)
 
 config X86_ETHERBOOT_BOOTOPTS
        string "Extra kernel boot options"
-       depends X86_ETHERBOOT_IMAGES
+       depends on X86_ETHERBOOT_IMAGES
        default "ip=dhcp nbdport=2000 " if TARGET_ROOTFS_SQUASHFS
        default "ip=dhcp root=/dev/nfs nfsroot=192.168.0.1:/srv/dbe61"
        help
        default "ip=dhcp nbdport=2000 " if TARGET_ROOTFS_SQUASHFS
        default "ip=dhcp root=/dev/nfs nfsroot=192.168.0.1:/srv/dbe61"
        help
@@ -15,26 +15,26 @@ config X86_ETHERBOOT_BOOTOPTS
 
 config X86_GRUB_IMAGES
        bool "Build GRUB images (Linux x86 or x86_64 host only)"
 
 config X86_GRUB_IMAGES
        bool "Build GRUB images (Linux x86 or x86_64 host only)"
-       depends TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc)
-       depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+       depends on TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc)
+       depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
        select PACKAGE_grub2
        default y
 
 config X86_GRUB_CONSOLE
        bool "Use Console Terminal (in addition to Serial)"
        select PACKAGE_grub2
        default y
 
 config X86_GRUB_CONSOLE
        bool "Use Console Terminal (in addition to Serial)"
-       depends X86_GRUB_IMAGES
+       depends on X86_GRUB_IMAGES
        default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
        default y
 
 config X86_GRUB_SERIAL
        string "Serial port device"
        default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
        default y
 
 config X86_GRUB_SERIAL
        string "Serial port device"
-       depends X86_GRUB_IMAGES
+       depends on X86_GRUB_IMAGES
        default "hvc0" if TARGET_x86_xen_domu
        default "ttyS0" if ! TARGET_x86_xen_domu
 
 config X86_GRUB_BAUDRATE
        int "Serial port baud rate"
        default "hvc0" if TARGET_x86_xen_domu
        default "ttyS0" if ! TARGET_x86_xen_domu
 
 config X86_GRUB_BAUDRATE
        int "Serial port baud rate"
-       depends X86_GRUB_IMAGES
+       depends on X86_GRUB_IMAGES
        default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
        default 38400 if TARGET_x86_alix2
        default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
        default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
        default 38400 if TARGET_x86_alix2
        default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
@@ -42,57 +42,57 @@ config X86_GRUB_BAUDRATE
 
 config X86_GRUB_BOOTOPTS
        string "Extra kernel boot options"
 
 config X86_GRUB_BOOTOPTS
        string "Extra kernel boot options"
-       depends X86_GRUB_IMAGES
+       depends on X86_GRUB_IMAGES
        default "xencons=hvc" if TARGET_x86_xen_domu
        help
          If you don't know, just leave it blank.
 
 config X86_GRUB_TIMEOUT
        string "Seconds to wait before booting the default entry"
        default "xencons=hvc" if TARGET_x86_xen_domu
        help
          If you don't know, just leave it blank.
 
 config X86_GRUB_TIMEOUT
        string "Seconds to wait before booting the default entry"
-       depends X86_GRUB_IMAGES
+       depends on X86_GRUB_IMAGES
        default "5"
        help
          If you don't know, 5 seconds is a reasonable default.
 
 config X86_VDI_IMAGES
        bool "Build VirtualBox image files (VDI)"
        default "5"
        help
          If you don't know, 5 seconds is a reasonable default.
 
 config X86_VDI_IMAGES
        bool "Build VirtualBox image files (VDI)"
-       depends X86_GRUB_IMAGES
-       depends TARGET_x86
-       depends TARGET_ROOTFS_EXT4FS
+       depends on X86_GRUB_IMAGES
+       depends on TARGET_x86
+       depends on TARGET_ROOTFS_EXT4FS
        select PACKAGE_kmod-pcnet32
 
 config X86_VMDK_IMAGES
        bool "Build VMware image files (VMDK)"
        select PACKAGE_kmod-pcnet32
 
 config X86_VMDK_IMAGES
        bool "Build VMware image files (VMDK)"
-       depends X86_GRUB_IMAGES
-       depends TARGET_x86
-       depends TARGET_ROOTFS_EXT4FS
+       depends on X86_GRUB_IMAGES
+       depends on TARGET_x86
+       depends on TARGET_ROOTFS_EXT4FS
        select PACKAGE_kmod-e1000
 
 
 config OLPC_BOOTSCRIPT_IMAGES
        bool "Build images with bootscript"
        select PACKAGE_kmod-e1000
 
 
 config OLPC_BOOTSCRIPT_IMAGES
        bool "Build images with bootscript"
-       depends TARGET_x86_olpc
-       depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+       depends on TARGET_x86_olpc
+       depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
        default TARGET_x86_olpc
 
 
 config TARGET_IMAGES_PAD
        bool "Pad images to filesystem size (for JFFS2)"
        default TARGET_x86_olpc
 
 
 config TARGET_IMAGES_PAD
        bool "Pad images to filesystem size (for JFFS2)"
-       depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+       depends on OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
 
 config TARGET_IMAGES_GZIP
        bool "GZip images"
 
 config TARGET_IMAGES_GZIP
        bool "GZip images"
-       depends TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
+       depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
        default y
 
 config TARGET_KERNEL_PARTSIZE
        int "Kernel partition size (in MB)"
        default y
 
 config TARGET_KERNEL_PARTSIZE
        int "Kernel partition size (in MB)"
-       depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+       depends on OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
        default 4
 
 config TARGET_ROOTFS_PARTNAME
        string "Root partition on target device"
        default 4
 
 config TARGET_ROOTFS_PARTNAME
        string "Root partition on target device"
-       depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+       depends on OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
        default "/dev/vda2" if TARGET_x86_kvm_guest
        default "/dev/xvda2" if TARGET_x86_xen_domu
        default "/dev/sda2" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
        default "/dev/vda2" if TARGET_x86_kvm_guest
        default "/dev/xvda2" if TARGET_x86_xen_domu
        default "/dev/sda2" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
index c8106d2abfe881ec15b1d66a90fe48d726e5a138..28c6f3e352613fc552a1ae815f58e02fd5a0e9e7 100644 (file)
@@ -1,6 +1,6 @@
 config SDK
        bool "Build the OpenWrt SDK"
 config SDK
        bool "Build the OpenWrt SDK"
-       depends !EXTERNAL_TOOLCHAIN
+       depends on !EXTERNAL_TOOLCHAIN
        help
          This is essentially a stripped-down version of the buildroot
          with a precompiled toolchain. It can be used to develop and
        help
          This is essentially a stripped-down version of the buildroot
          with a precompiled toolchain. It can be used to develop and
index 18c3ab544de5f4124b937dd81390e1bf273e3135..eda2300a12dc3dc3120fde7ce2df179c4bd40c55 100644 (file)
@@ -1,6 +1,6 @@
 config MAKE_TOOLCHAIN
        bool "Build the OpenWrt based Toolchain"
 config MAKE_TOOLCHAIN
        bool "Build the OpenWrt based Toolchain"
-       depends !EXTERNAL_TOOLCHAIN
+       depends on !EXTERNAL_TOOLCHAIN
        help
          This is essentially the toolchain created by OpenWrt.
 
        help
          This is essentially the toolchain created by OpenWrt.
 
index cbac108cd0c65202157bcbaf8cebeab43603e13a..94133002400b2a1cb02192ad40aa6d72778f1f72 100644 (file)
@@ -9,7 +9,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config NATIVE_TOOLCHAIN
                bool
                prompt "Use host's toolchain"  if DEVEL
        config NATIVE_TOOLCHAIN
                bool
                prompt "Use host's toolchain"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN
                select NO_STRIP
                help
                  If enabled, OpenWrt will compile using the native toolchain for your host instead of compiling one
                select NO_STRIP
                help
                  If enabled, OpenWrt will compile using the native toolchain for your host instead of compiling one
@@ -17,7 +17,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config TARGET_NAME
                string
                prompt "Target name"  if DEVEL
        config TARGET_NAME
                string
                prompt "Target name"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "arm-unknown-linux-gnu"      if arm
                default "armeb-unknown-linux-gnu"    if armeb
                default "i486-unknown-linux-gnu"     if i386
                default "arm-unknown-linux-gnu"      if arm
                default "armeb-unknown-linux-gnu"    if armeb
                default "i486-unknown-linux-gnu"     if i386
@@ -29,7 +29,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config TOOLCHAIN_PREFIX
                string
                prompt "Toolchain prefix"  if DEVEL
        config TOOLCHAIN_PREFIX
                string
                prompt "Toolchain prefix"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "arm-unknown-linux-gnu-"      if arm
                default "armeb-unknown-linux-gnu-"    if armeb
                default "i486-unknown-linux-gnu-"     if i386
                default "arm-unknown-linux-gnu-"      if arm
                default "armeb-unknown-linux-gnu-"    if armeb
                default "i486-unknown-linux-gnu-"     if i386
@@ -41,7 +41,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config TOOLCHAIN_ROOT
                string
                prompt "Toolchain root"  if DEVEL
        config TOOLCHAIN_ROOT
                string
                prompt "Toolchain root"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "/opt/cross/arm-unknown-linux-gnu"      if arm
                default "/opt/cross/armeb-unknown-linux-gnu"    if armeb
                default "/opt/cross/i486-unknown-linux-gnu"     if i386
                default "/opt/cross/arm-unknown-linux-gnu"      if arm
                default "/opt/cross/armeb-unknown-linux-gnu"    if armeb
                default "/opt/cross/i486-unknown-linux-gnu"     if i386
@@ -53,7 +53,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config TOOLCHAIN_LIBC
                string
                prompt "Toolchain libc"  if DEVEL
        config TOOLCHAIN_LIBC
                string
                prompt "Toolchain libc"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "uclibc"
                help
                  Specify the libc type used by the external toolchain. The given value us passed as -m
                default "uclibc"
                help
                  Specify the libc type used by the external toolchain. The given value us passed as -m
@@ -64,7 +64,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config TOOLCHAIN_BIN_PATH
                string
                prompt "Toolchain program path"  if DEVEL
        config TOOLCHAIN_BIN_PATH
                string
                prompt "Toolchain program path"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "./usr/bin ./bin"
                help
                  Specify additional directories searched for toolchain binaries (override PATH)
                default "./usr/bin ./bin"
                help
                  Specify additional directories searched for toolchain binaries (override PATH)
@@ -73,7 +73,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config TOOLCHAIN_INC_PATH
                string
                prompt "Toolchain include path"  if DEVEL
        config TOOLCHAIN_INC_PATH
                string
                prompt "Toolchain include path"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "./usr/include ./include"
                help
                  Specify additional directories searched for header files (override CPPFLAGS)
                default "./usr/include ./include"
                help
                  Specify additional directories searched for header files (override CPPFLAGS)
@@ -82,7 +82,7 @@ menuconfig EXTERNAL_TOOLCHAIN
        config TOOLCHAIN_LIB_PATH
                string
                prompt "Toolchain library path"  if DEVEL
        config TOOLCHAIN_LIB_PATH
                string
                prompt "Toolchain library path"  if DEVEL
-               depends EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
+               depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
                default "./usr/lib ./lib"
                help
                  Specify additional directories searched for libraries (override LDFLAGS)
                default "./usr/lib ./lib"
                help
                  Specify additional directories searched for libraries (override LDFLAGS)
@@ -90,17 +90,17 @@ menuconfig EXTERNAL_TOOLCHAIN
 
 config NEED_TOOLCHAIN
        bool
 
 config NEED_TOOLCHAIN
        bool
-       depends DEVEL
+       depends on DEVEL
        default y if !EXTERNAL_TOOLCHAIN
 
 menuconfig TOOLCHAINOPTS
        bool "Toolchain Options"  if DEVEL
        default y if !EXTERNAL_TOOLCHAIN
 
 menuconfig TOOLCHAINOPTS
        bool "Toolchain Options"  if DEVEL
-       depends NEED_TOOLCHAIN
+       depends on NEED_TOOLCHAIN
 
 menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
 
 menuconfig EXTRA_TARGET_ARCH
        bool
        prompt "Enable an extra toolchain target architecture" if TOOLCHAINOPTS
-       depends !sparc
+       depends on !sparc
        default y       if powerpc64
        default n
        help
        default y       if powerpc64
        default n
        help
@@ -150,17 +150,17 @@ menuconfig EXTRA_TARGET_ARCH
        endchoice
 
 comment "Binary tools"
        endchoice
 
 comment "Binary tools"
-       depends TOOLCHAINOPTS
+       depends on TOOLCHAINOPTS
 
 source "toolchain/binutils/Config.in"
 
 comment "Compiler"
 
 source "toolchain/binutils/Config.in"
 
 comment "Compiler"
-       depends TOOLCHAINOPTS
+       depends on TOOLCHAINOPTS
 
 source "toolchain/gcc/Config.in"
 
 comment "C Library"
 
 source "toolchain/gcc/Config.in"
 
 comment "C Library"
-       depends TOOLCHAINOPTS
+       depends on TOOLCHAINOPTS
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
 
 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
@@ -170,14 +170,14 @@ choice
 
        config USE_EGLIBC
                bool "Use eglibc"
 
        config USE_EGLIBC
                bool "Use eglibc"
-               depends !avr32
+               depends on !avr32
        
        config USE_UCLIBC
                bool "Use uClibc"
 
        config USE_MUSL
                bool "Use musl"
        
        config USE_UCLIBC
                bool "Use uClibc"
 
        config USE_MUSL
                bool "Use musl"
-               depends !(mips64 || mips64el)
+               depends on !(mips64 || mips64el)
 
 endchoice
 
 
 endchoice
 
@@ -186,11 +186,11 @@ source "toolchain/uClibc/Config.in"
 source "toolchain/musl/Config.in"
 
 comment "Debuggers"
 source "toolchain/musl/Config.in"
 
 comment "Debuggers"
-       depends TOOLCHAINOPTS
+       depends on TOOLCHAINOPTS
 
 config GDB
        bool
 
 config GDB
        bool
-       depends !avr32
+       depends on !avr32
        prompt "Build gdb" if TOOLCHAINOPTS
        default y
        help
        prompt "Build gdb" if TOOLCHAINOPTS
        default y
        help
@@ -240,7 +240,7 @@ config TARGET_SUFFIX
        default "musl"            if USE_MUSL && !(arm || armeb)
 
 config MIPS64_ABI
        default "musl"            if USE_MUSL && !(arm || armeb)
 
 config MIPS64_ABI
-       depends mips64 || mips64el
+       depends on mips64 || mips64el
        string
        default "64" if MIPS64_ABI_N64
        default "n32" if MIPS64_ABI_N32
        string
        default "64" if MIPS64_ABI_N64
        default "n32" if MIPS64_ABI_N32
index 8c90597091527b729f185d22c27b9c5ec589aadd..e8f1b8ff34887a8c393d760891250eff76b9b201 100644 (file)
@@ -11,19 +11,19 @@ choice
                bool "binutils 2.19.1"
 
        config BINUTILS_VERSION_2_20_1
                bool "binutils 2.19.1"
 
        config BINUTILS_VERSION_2_20_1
-               depends avr32
+               depends on avr32
                bool "binutils 2.20.1"
 
        config BINUTILS_VERSION_2_21_1
                bool "binutils 2.20.1"
 
        config BINUTILS_VERSION_2_21_1
-               depends !avr32 || (avr32 && BROKEN)
+               depends on !avr32 || (avr32 && BROKEN)
                bool "binutils 2.21.1"
 
        config BINUTILS_VERSION_2_22
                bool "binutils 2.21.1"
 
        config BINUTILS_VERSION_2_22
-               depends !avr32 || (avr32 && BROKEN)
+               depends on !avr32 || (avr32 && BROKEN)
                bool "binutils 2.22"
 
        config BINUTILS_VERSION_2_23_1
                bool "binutils 2.22"
 
        config BINUTILS_VERSION_2_23_1
-               depends !avr32 || (avr32 && BROKEN)
+               depends on !avr32 || (avr32 && BROKEN)
                bool "binutils 2.23.1"
 
 endchoice
                bool "binutils 2.23.1"
 
 endchoice
index 11f9abe11d8c150ac751d04a6b2c8b87b1270f20..de5c5b429dab031b4b3699d6387733cb0f465580 100644 (file)
@@ -7,15 +7,15 @@ choice
 
        config EGLIBC_VERSION_2_15
                bool "eglibc 2.15"
 
        config EGLIBC_VERSION_2_15
                bool "eglibc 2.15"
-               depends !GCC_VERSION_LLVM
+               depends on !GCC_VERSION_LLVM
 
        config EGLIBC_VERSION_2_16
                bool "eglibc 2.16"
 
        config EGLIBC_VERSION_2_16
                bool "eglibc 2.16"
-               depends !GCC_VERSION_LLVM
+               depends on !GCC_VERSION_LLVM
 
        config EGLIBC_VERSION_2_17
                bool "eglibc 2.17"
 
        config EGLIBC_VERSION_2_17
                bool "eglibc 2.17"
-               depends !GCC_VERSION_LLVM
+               depends on !GCC_VERSION_LLVM
 
 endchoice
 
 
 endchoice
 
index 811c6d47c24f629fe38b6487dfcd4c96f52d1259..7becaa8a307ae039043a48ede7a71b32c0eb7249 100644 (file)
@@ -9,7 +9,7 @@ choice
 
        config GCC_VERSION_4_4_7
                bool "gcc 4.4.7"
 
        config GCC_VERSION_4_4_7
                bool "gcc 4.4.7"
-               depends avr32
+               depends on avr32
 
        config GCC_VERSION_4_6_3
                bool "gcc 4.6.3"
 
        config GCC_VERSION_4_6_3
                bool "gcc 4.6.3"
@@ -35,7 +35,7 @@ config GCC_USE_GRAPHITE
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
        prompt "Use the system versions of PPL and CLooG"
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
        prompt "Use the system versions of PPL and CLooG"
-       depends GCC_USE_GRAPHITE
+       depends on GCC_USE_GRAPHITE
        default n
 
 config EXTRA_GCC_CONFIG_OPTIONS
        default n
 
 config EXTRA_GCC_CONFIG_OPTIONS