diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2011-01-18 22:56:20 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-01-19 10:04:26 +0100 |
commit | 6219f378f90e9e037e5ebe3c78513ebcdb83fa7f (patch) | |
tree | 200fd9a1ec95171a17a296ea3be3dfe7fab72c45 /rules/iproute2.in | |
parent | a241ccfff97441eba2ff500f675ef0fc0022e992 (diff) | |
download | ptxdist-6219f378f90e9e037e5ebe3c78513ebcdb83fa7f.tar.gz ptxdist-6219f378f90e9e037e5ebe3c78513ebcdb83fa7f.tar.xz |
Do not allow 'ip' from the 'iproute2' package if the 'ip' from busybox is enabled
If busybox's and iproute2's ip command is enabled, the one from iproute2 seem to lose.
This patch allows the selection of only one of these command.
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
[mol: '|| ALLYES' added]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/iproute2.in')
-rw-r--r-- | rules/iproute2.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/iproute2.in b/rules/iproute2.in index 800747e68..a1067b2da 100644 --- a/rules/iproute2.in +++ b/rules/iproute2.in @@ -24,8 +24,12 @@ if IPROUTE2 config IPROUTE2_IP bool + depends on !BUSYBOX_IP || ALLYES prompt "ip" +comment "busybox' ip is selected" + depends on BUSYBOX_IP + config IPROUTE2_RTMON bool prompt "rtmon" |