diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-12-23 16:49:07 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-12-23 16:56:43 +0100 |
| commit | 0b8835861b2e43cb45becdb560877bcc89aea827 (patch) | |
| tree | ed8dedb7521a120702e8d17ebecfb68e2c5c1103 /coreutils | |
| parent | 04c1a2a2c4a5faaa1600ed0831c9a1be17dbdb3f (diff) | |
| download | busybox-w32-0b8835861b2e43cb45becdb560877bcc89aea827.tar.gz busybox-w32-0b8835861b2e43cb45becdb560877bcc89aea827.tar.bz2 busybox-w32-0b8835861b2e43cb45becdb560877bcc89aea827.zip | |
Make it possible to select "sh" and "bash" aliases without selecting ash or hush
The same can be done for msh, but we are probably better off just deleting it
in a next versio or two.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/Kbuild.src | 20 | ||||
| -rw-r--r-- | coreutils/test.c | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index 8e2c097a3..d9a448781 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src | |||
| @@ -10,12 +10,16 @@ lib-y:= | |||
| 10 | 10 | ||
| 11 | INSERT | 11 | INSERT |
| 12 | 12 | ||
| 13 | lib-$(CONFIG_MORE) += cat.o # more uses it if stdout isn't a tty | 13 | lib-$(CONFIG_MORE) += cat.o # more uses it if stdout isn't a tty |
| 14 | lib-$(CONFIG_LESS) += cat.o # less too | 14 | lib-$(CONFIG_LESS) += cat.o # less too |
| 15 | lib-$(CONFIG_CRONTAB) += cat.o # crontab -l | 15 | lib-$(CONFIG_CRONTAB) += cat.o # crontab -l |
| 16 | lib-$(CONFIG_ADDUSER) += chown.o # used by adduser | 16 | lib-$(CONFIG_ADDUSER) += chown.o # used by adduser |
| 17 | lib-$(CONFIG_ADDGROUP) += chown.o # used by adduser | 17 | lib-$(CONFIG_ADDGROUP) += chown.o # used by adduser |
| 18 | lib-$(CONFIG_ASH) += echo.o # used by ash | 18 | lib-$(CONFIG_ASH) += echo.o # used by ash |
| 19 | lib-$(CONFIG_HUSH) += echo.o # used by hush | 19 | lib-$(CONFIG_SH_IS_ASH) += echo.o # used by ash |
| 20 | lib-$(CONFIG_FTPD) += ls.o # used by ftpd | 20 | lib-$(CONFIG_BASH_IS_ASH) += echo.o # used by ash |
| 21 | lib-$(CONFIG_HUSH) += echo.o # used by hush | ||
| 22 | lib-$(CONFIG_SH_IS_HUSH) += echo.o # used by hush | ||
| 23 | lib-$(CONFIG_BASH_IS_HUSH) += echo.o # used by hush | ||
| 24 | lib-$(CONFIG_FTPD) += ls.o # used by ftpd | ||
| 21 | lib-$(CONFIG_ASH_BUILTIN_PRINTF) += printf.o | 25 | lib-$(CONFIG_ASH_BUILTIN_PRINTF) += printf.o |
diff --git a/coreutils/test.c b/coreutils/test.c index 9e18ee986..288f66508 100644 --- a/coreutils/test.c +++ b/coreutils/test.c | |||
| @@ -55,6 +55,8 @@ | |||
| 55 | //kbuild:lib-$(CONFIG_TEST2) += test.o test_ptr_hack.o | 55 | //kbuild:lib-$(CONFIG_TEST2) += test.o test_ptr_hack.o |
| 56 | //kbuild:lib-$(CONFIG_ASH_BUILTIN_TEST) += test.o test_ptr_hack.o | 56 | //kbuild:lib-$(CONFIG_ASH_BUILTIN_TEST) += test.o test_ptr_hack.o |
| 57 | //kbuild:lib-$(CONFIG_HUSH) += test.o test_ptr_hack.o | 57 | //kbuild:lib-$(CONFIG_HUSH) += test.o test_ptr_hack.o |
| 58 | //kbuild:lib-$(CONFIG_SH_IS_HUSH) += test.o test_ptr_hack.o | ||
| 59 | //kbuild:lib-$(CONFIG_BASH_IS_HUSH) += test.o test_ptr_hack.o | ||
| 58 | 60 | ||
| 59 | /* "test --help" is special-cased to ignore --help */ | 61 | /* "test --help" is special-cased to ignore --help */ |
| 60 | //usage:#define test_trivial_usage NOUSAGE_STR | 62 | //usage:#define test_trivial_usage NOUSAGE_STR |