summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-17 15:36:41 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-17 15:36:41 +0000
commitcac6e3495f74f87646f4d177eb2c978feb5d3fdd (patch)
tree35312acb559b1e156faf6423deb2371664ed928d
parent02fb7e955f9ec860726e5579893e4dfcae16aaf0 (diff)
build: consistently use 'depends on' instead of 'depends'
make the syntax more compatible with kernel menuconfig Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36351 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Config.in78
-rw-r--r--package/libs/libpcap/Config.in8
-rw-r--r--package/libs/openssl/Config.in2
-rw-r--r--package/mac80211/Makefile2
-rw-r--r--package/network/services/hostapd/Config.in6
-rw-r--r--package/network/services/samba36/Makefile2
-rw-r--r--package/system/mmc_over_gpio/Makefile2
-rw-r--r--package/toolchain/Makefile54
-rwxr-xr-xscripts/metadata.pl14
-rw-r--r--target/Config.in4
-rw-r--r--target/imagebuilder/Config.in6
-rw-r--r--target/linux/at91/image/Config.in12
-rw-r--r--target/linux/avr32/image/Config.in6
-rw-r--r--target/linux/brcm2708/image/Config.in2
-rw-r--r--target/linux/x86/image/Config.in42
-rw-r--r--target/sdk/Config.in2
-rw-r--r--target/toolchain/Config.in2
-rw-r--r--toolchain/Config.in38
-rw-r--r--toolchain/binutils/Config.in8
-rw-r--r--toolchain/eglibc/Config.in6
-rw-r--r--toolchain/gcc/Config.in4
21 files changed, 150 insertions, 150 deletions
diff --git a/Config.in b/Config.in
index 98786fcdb..115348071 100644
--- 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
- depends TARGET_ROOTFS_INITRAMFS
+ depends on TARGET_ROOTFS_INITRAMFS
help
Select ramdisk compression.
@@ -74,7 +74,7 @@ menu "Target Images"
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
@@ -82,28 +82,28 @@ menu "Target Images"
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
- 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
- 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
- depends !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+ depends on !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
help
Build a ubifs root filesystem
@@ -113,21 +113,21 @@ menu "Target Images"
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"
- 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"
- 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
@@ -303,90 +303,90 @@ menu "Global build settings"
config KERNEL_FREEZER
bool
default y if KERNEL_CGROUP_FREEZER
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_CGROUP_FREEZER
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_CGROUP_DEVICE
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
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
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
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
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_CGROUP_MEM_RES_CTLR
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_CGROUP_MEM_RES_CTLR_SWAP
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_CGROUP_MEM_RES_CTLR_SWAP_ENABLED
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_CGROUP_MEM_RES_CTLR_KMEM
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_CGROUP_PERF
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
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
- depends KERNEL_CGROUP_SCHED
+ depends on 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
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_NET_CLS_CGROUP
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_NETPRIO_CGROUP
bool
- depends KERNEL_CGROUPS
+ depends on KERNEL_CGROUPS
config KERNEL_BLK_CGROUP
bool
- depends KERNEL_CGROUPS
+ depends on 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"
@@ -410,27 +410,27 @@ menu "Global build settings"
config KERNEL_UTS_NS
bool
- depends KERNEL_NAMESPACES
+ depends on KERNEL_NAMESPACES
config KERNEL_IPC_NS
bool
- depends KERNEL_NAMESPACES
+ depends on KERNEL_NAMESPACES
config KERNEL_USER_NS
bool
- depends KERNEL_NAMESPACES
+ depends on KERNEL_NAMESPACES
config KERNEL_PID_NS
bool
- depends KERNEL_NAMESPACES
+ depends on KERNEL_NAMESPACES
config KERNEL_NET_NS
bool
- depends KERNEL_NAMESPACES
+ depends on KERNEL_NAMESPACES
config KERNEL_DEVPTS_MULTIPLE_INSTANCES
bool
- depends KERNEL_NAMESPACES
+ depends on KERNEL_NAMESPACES
config KERNEL_NAMESPACES
bool "Enable kernel namespaces"
@@ -536,9 +536,9 @@ menu "Global build settings"
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
@@ -546,7 +546,7 @@ menu "Global build settings"
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
diff --git a/package/libs/libpcap/Config.in b/package/libs/libpcap/Config.in
index ef32c1bc0..5fee75a59 100644
--- a/package/libs/libpcap/Config.in
+++ b/package/libs/libpcap/Config.in
@@ -1,15 +1,15 @@
menu "Configuration"
- depends PACKAGE_libpcap
+ depends on PACKAGE_libpcap
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"
- depends PACKAGE_kmod-bluetooth
- depends BROKEN
+ depends on PACKAGE_kmod-bluetooth
+ depends on BROKEN
default n
endmenu
diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config.in
index 11591de04..70d520cd1 100644
--- a/package/libs/openssl/Config.in
+++ b/package/libs/openssl/Config.in
@@ -7,7 +7,7 @@ config OPENSSL_ENGINE_CRYPTO
config OPENSSL_ENGINE_DIGEST
bool
- depends OPENSSL_ENGINE_CRYPTO
+ depends on OPENSSL_ENGINE_CRYPTO
prompt "Digests acceleration support"
endmenu
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 852fb0e52..6d5ca0774 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -221,7 +221,7 @@ define KernelPackage/rt2x00-lib/config
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
diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
index 810c5a09a..b39be38fd 100644
--- a/package/network/services/hostapd/Config.in
+++ b/package/network/services/hostapd/Config.in
@@ -1,7 +1,7 @@
# 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
@@ -10,7 +10,7 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
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"
@@ -23,7 +23,7 @@ endchoice
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
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 2842c982b..2644f7d56 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -49,7 +49,7 @@ endef
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
diff --git a/package/system/mmc_over_gpio/Makefile b/package/system/mmc_over_gpio/Makefile
index 8525887dd..62d0ba5b7 100644
--- a/package/system/mmc_over_gpio/Makefile
+++ b/package/system/mmc_over_gpio/Makefile
@@ -25,7 +25,7 @@ endef
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"
diff --git a/package/toolchain/Makefile b/package/toolchain/Makefile
index b9d582ee4..7eadaba0d 100644
--- a/package/toolchain/Makefile
+++ b/package/toolchain/Makefile
@@ -34,19 +34,19 @@ endef
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"
- 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)"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc
default "./lib/libgcc_s.so.*"
endmenu
@@ -61,19 +61,19 @@ endef
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"
- 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)"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
default "./lib/libssp.so.*"
endmenu
@@ -89,19 +89,19 @@ endef
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"
- 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)"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp
default "./lib/libstdc++.so.*"
endmenu
@@ -125,19 +125,19 @@ endef
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"
- 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)"
- 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
@@ -151,19 +151,19 @@ endef
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"
- 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)"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread
default "./lib/libpthread{-*.so,.so.*}"
endmenu
@@ -184,19 +184,19 @@ endef
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"
- 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)"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_librt
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt
default "./lib/librt{-*.so,.so.*}"
endmenu
@@ -211,19 +211,19 @@ endef
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"
- 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)"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran
default "./usr/lib/libgfortran.so.*"
endmenu
@@ -239,19 +239,19 @@ endef
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"
- 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"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd
default "./usr/bin/ldd"
endmenu
@@ -268,19 +268,19 @@ endef
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"
- 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"
- depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
+ depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig
default "./sbin/ldconfig"
endmenu
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 6249127e3..b0abd78a0 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -153,7 +153,7 @@ sub target_config_features(@) {
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";
@@ -230,11 +230,11 @@ config TARGET_$target->{conf}
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";
- grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends BROKEN\n";
+ grep { /broken/ } @{$target->{features}} and $confstr .= "\tdepends on BROKEN\n";
} else {
$confstr .= $features;
}
@@ -243,7 +243,7 @@ EOF
$confstr .= "\tselect $target->{arch}\n";
}
foreach my $dep (@{$target->{depends}}) {
- my $mode = "depends";
+ my $mode = "depends on";
my $flags;
my $name;
@@ -317,7 +317,7 @@ EOF
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";
@@ -443,7 +443,7 @@ sub mconf_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;
@@ -602,7 +602,7 @@ sub gen_package_config() {
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
diff --git a/target/Config.in b/target/Config.in
index 8ff89ff8a..967149d43 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -3,7 +3,7 @@ source "tmp/.config-target.in"
# Kernel/Hardware features
config HAS_SPE_FPU
- depends powerpc
+ depends on powerpc
select HAS_FPU
bool
@@ -67,7 +67,7 @@ config NOMMU
bool
config HAS_MIPS16
- depends (mips || mipsel || mips64 || mips64el)
+ depends on (mips || mipsel || mips64 || mips64el)
bool
config ARCH_64BIT
diff --git a/target/imagebuilder/Config.in b/target/imagebuilder/Config.in
index 23a418bf5..d3bc72940 100644
--- a/target/imagebuilder/Config.in
+++ b/target/imagebuilder/Config.in
@@ -1,8 +1,8 @@
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.
diff --git a/target/linux/at91/image/Config.in b/target/linux/at91/image/Config.in
index 917398f26..54a501dcb 100644
--- a/target/linux/at91/image/Config.in
+++ b/target/linux/at91/image/Config.in
@@ -1,16 +1,16 @@
config AT91_DFBOOT
bool "Build dataflashboot loader"
- depends TARGET_at91
+ depends on TARGET_at91
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"
- depends AT91_UBOOT
+ depends on AT91_UBOOT
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"
- 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"
- 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)"
- depends TARGET_at91_flexibity
+ depends on TARGET_at91_flexibity
default n
diff --git a/target/linux/avr32/image/Config.in b/target/linux/avr32/image/Config.in
index bc5469e7a..7448a0f21 100644
--- a/target/linux/avr32/image/Config.in
+++ b/target/linux/avr32/image/Config.in
@@ -1,12 +1,12 @@
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"
- 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
diff --git a/target/linux/brcm2708/image/Config.in b/target/linux/brcm2708/image/Config.in
index b9bea8647..f7abd9d39 100644
--- a/target/linux/brcm2708/image/Config.in
+++ b/target/linux/brcm2708/image/Config.in
@@ -1,5 +1,5 @@
config BRCM2708_SD_BOOT_PARTSIZE
int "Boot (SD Card) filesystem partition size (in MB)"
- depends TARGET_brcm2708
+ depends on TARGET_brcm2708
default 20
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 9ced34c93..d7b5e90d1 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,13 +1,13 @@
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"
- 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
@@ -15,26 +15,26 @@ config X86_ETHERBOOT_BOOTOPTS
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)"
- 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"
- 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"
- 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
@@ -42,57 +42,57 @@ config X86_GRUB_BAUDRATE
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"
- 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)"
- 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)"
- 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"
- 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)"
- depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+ depends on OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_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)"
- 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"
- 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)
diff --git a/target/sdk/Config.in b/target/sdk/Config.in
index c8106d2ab..28c6f3e35 100644
--- a/target/sdk/Config.in
+++ b/target/sdk/Config.in
@@ -1,6 +1,6 @@
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
diff --git a/target/toolchain/Config.in b/target/toolchain/Config.in
index 18c3ab544..eda2300a1 100644
--- a/target/toolchain/Config.in
+++ b/target/toolchain/Config.in
@@ -1,6 +1,6 @@
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.
diff --git a/toolchain/Config.in b/toolchain/Config.in
index cbac108cd..941330024 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -9,7 +9,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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
@@ -17,7 +17,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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
@@ -29,7 +29,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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
@@ -41,7 +41,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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
@@ -53,7 +53,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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
@@ -64,7 +64,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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)
@@ -73,7 +73,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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)
@@ -82,7 +82,7 @@ menuconfig EXTERNAL_TOOLCHAIN
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)
@@ -90,17 +90,17 @@ menuconfig EXTERNAL_TOOLCHAIN
config NEED_TOOLCHAIN
bool
- depends DEVEL
+ depends on 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
- depends !sparc
+ depends on !sparc
default y if powerpc64
default n
help
@@ -150,17 +150,17 @@ menuconfig EXTRA_TARGET_ARCH
endchoice
comment "Binary tools"
- depends TOOLCHAINOPTS
+ depends on TOOLCHAINOPTS
source "toolchain/binutils/Config.in"
comment "Compiler"
- depends TOOLCHAINOPTS
+ depends on TOOLCHAINOPTS
source "toolchain/gcc/Config.in"
comment "C Library"
- depends TOOLCHAINOPTS
+ depends on TOOLCHAINOPTS
choice
prompt "C Library implementation" if TOOLCHAINOPTS
@@ -170,14 +170,14 @@ choice
config USE_EGLIBC
bool "Use eglibc"
- depends !avr32
+ depends on !avr32
config USE_UCLIBC
bool "Use uClibc"
config USE_MUSL
bool "Use musl"
- depends !(mips64 || mips64el)
+ depends on !(mips64 || mips64el)
endchoice
@@ -186,11 +186,11 @@ source "toolchain/uClibc/Config.in"
source "toolchain/musl/Config.in"
comment "Debuggers"
- depends TOOLCHAINOPTS
+ depends on TOOLCHAINOPTS
config GDB
bool
- depends !avr32
+ depends on !avr32
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
- depends mips64 || mips64el
+ depends on mips64 || mips64el
string
default "64" if MIPS64_ABI_N64
default "n32" if MIPS64_ABI_N32
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 8c9059709..e8f1b8ff3 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -11,19 +11,19 @@ choice
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
- depends !avr32 || (avr32 && BROKEN)
+ depends on !avr32 || (avr32 && BROKEN)
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
- depends !avr32 || (avr32 && BROKEN)
+ depends on !avr32 || (avr32 && BROKEN)
bool "binutils 2.23.1"
endchoice
diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index 11f9abe11..de5c5b429 100644
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -7,15 +7,15 @@ choice
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"
- depends !GCC_VERSION_LLVM
+ depends on !GCC_VERSION_LLVM
config EGLIBC_VERSION_2_17
bool "eglibc 2.17"
- depends !GCC_VERSION_LLVM
+ depends on !GCC_VERSION_LLVM
endchoice
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 811c6d47c..7becaa8a3 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -9,7 +9,7 @@ choice
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"
@@ -35,7 +35,7 @@ config GCC_USE_GRAPHITE
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