diff options
author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2017-09-06 18:15:47 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-09-06 18:19:38 +0200 |
commit | 8eb5f9cfb52d526c2ac93068e217805e4a9b5ebd (patch) | |
tree | 9126ee3933c782e2e0f92a5b12a2012ae6fd11fc | |
parent | 5c85ff9e3c44d8c32d766a823a3caace60b85126 (diff) | |
download | ptxdist-8eb5f9cfb52d526c2ac93068e217805e4a9b5ebd.tar.gz ptxdist-8eb5f9cfb52d526c2ac93068e217805e4a9b5ebd.tar.xz |
coreutils: prevent conflicts with new busybox applets
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | rules/coreutils.in | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/rules/coreutils.in b/rules/coreutils.in index 8eff96b69..75d897440 100644 --- a/rules/coreutils.in +++ b/rules/coreutils.in @@ -211,6 +211,10 @@ comment "busybox' cut is selected!" config COREUTILS_SHRED bool prompt "shred" + depends on !BUSYBOX_SHRED || ALLYES + +comment "busybox' shred is selected!" + depends on BUSYBOX_SHRED config COREUTILS_OD bool @@ -283,6 +287,10 @@ comment "busybox' touch is selected!" config COREUTILS_PASTE bool prompt "paste" + depends on !BUSYBOX_PASTE || ALLYES + +comment "busybox' paste is selected!" + depends on BUSYBOX_PASTE config COREUTILS_MKNOD bool @@ -372,6 +380,10 @@ comment "busybox' yes is selected!" config COREUTILS_FACTOR bool prompt "factor" + depends on !BUSYBOX_FACTOR || ALLYES + +comment "busybox' factor is selected!" + depends on BUSYBOX_FACTOR config COREUTILS_JOIN bool @@ -504,6 +516,10 @@ comment "busybox' id is selected!" config COREUTILS_LINK bool prompt "link" + depends on !BUSYBOX_LINK || ALLYES + +comment "busybox' link is selected!" + depends on BUSYBOX_LINK config COREUTILS_SLEEP bool @@ -568,6 +584,10 @@ config COREUTILS_PATHCHK config COREUTILS_NL bool prompt "nl" + depends on !BUSYBOX_NL || ALLYES + +comment "busybox' nl is selected!" + depends on BUSYBOX_NL config COREUTILS_WC bool @@ -592,6 +612,10 @@ comment "busybox' unexpand is selected!" config COREUTILS_NPROC bool prompt "nproc" + depends on !BUSYBOX_NPROC || ALLYES + +comment "busybox' nproc is selected!" + depends on BUSYBOX_NPROC config COREUTILS_NUMFMT bool |