diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | shell/config.in | 18 | ||||
| -rw-r--r-- | sysdeps/linux/defconfig | 63 |
3 files changed, 43 insertions, 42 deletions
@@ -212,7 +212,7 @@ bbsubdirs: $(patsubst %, _dir_%, $(SUBDIRS)) $(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/config/MARKER $(MAKE) CFLAGS="$(CFLAGS)" -C $(patsubst _dir_%, %, $@) -busybox: config.h depend bbsubdirs +busybox: config.h dep-files bbsubdirs $(CC) $(LDFLAGS) -o $@ applets/busybox.o $(shell find $(SUBDIRS) -name \*.a) $(LIBCONFIG_LIB) $(LIBRARIES) $(STRIPCMD) @@ -295,7 +295,7 @@ scripts/split-include: scripts/split-include.c $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c dep-files: scripts/mkdep - if [ ! -f .depend ] ; then \ + @if [ ! -f .depend ] ; then \ rm -f .depend .hdepend; \ mkdir -p $(TOPDIR)/include/config; \ scripts/mkdep -I $(TOPDIR)/include -- \ diff --git a/shell/config.in b/shell/config.in index b9100401e..2efec9765 100644 --- a/shell/config.in +++ b/shell/config.in @@ -15,32 +15,24 @@ choice 'Choose your default shell' \ if [ "$CONFIG_FEATURE_SH_IS_ASH" = "y" ] ; then define_bool CONFIG_ASH y - comment 'ash' -else - bool 'ash' CONFIG_ASH fi - + if [ "$CONFIG_FEATURE_SH_IS_HUSH" = "y" ] ; then define_bool CONFIG_HUSH y - comment 'hush' -else - bool 'hush' CONFIG_HUSH fi if [ "$CONFIG_FEATURE_SH_IS_LASH" = "y" ] ; then define_bool CONFIG_LASH y - comment 'lash' -else - bool 'lash' CONFIG_LASH fi if [ "$CONFIG_FEATURE_SH_IS_MSH" = "y" ] ; then define_bool CONFIG_MSH y - comment 'msh' -else - bool 'msh' CONFIG_MSH fi +bool 'ash' CONFIG_ASH +bool 'hush' CONFIG_HUSH +bool 'lash' CONFIG_LASH +bool 'msh' CONFIG_MSH comment 'Bourne Shell Options' bool 'command line editing' CONFIG_FEATURE_COMMAND_EDITING diff --git a/sysdeps/linux/defconfig b/sysdeps/linux/defconfig index 8d65b0404..9ce277721 100644 --- a/sysdeps/linux/defconfig +++ b/sysdeps/linux/defconfig @@ -1,5 +1,5 @@ # -# Automatically generated by make menuconfig: don't edit +# Automatically generated make config: don't edit # # @@ -47,17 +47,7 @@ CONFIG_RESET=y # Editors # CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +# CONFIG_VI is not set # # File Utilities @@ -85,7 +75,15 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SYNC=y CONFIG_TOUCH=y + +# +# Common options for ls and more +# CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# CONFIG_FEATURE_HUMAN_READABLE=y # @@ -106,9 +104,9 @@ CONFIG_WHICH=y # CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_INITRD=y -CONFIG_FEATURE_INIT_COREDUMPS=y -CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INITRD is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y @@ -131,14 +129,10 @@ CONFIG_REBOOT=y # # Module Utilities # -CONFIG_INSMOD=y -CONFIG_LSMOD=y -CONFIG_MODPROBE=y -CONFIG_RMMOD=y -CONFIG_FEATURE_NEW_MODULE_INTERFACE=y -# CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_INSMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set +# CONFIG_RMMOD is not set # # Networking Utilities @@ -192,15 +186,20 @@ CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_MSH is not set # CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y +CONFIG_ASH=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set + +# +# Bourne Shell Options +# CONFIG_FEATURE_COMMAND_EDITING=y CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y -CONFIG_FEATURE_SH_STANDALONE_SHELL=y -CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN=y -CONFIG_FEATURE_SH_FANCY_PROMPT=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set +# CONFIG_FEATURE_SH_FANCY_PROMPT is not set # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # @@ -224,6 +223,8 @@ CONFIG_SLEEP=y # CONFIG_TEE is not set CONFIG_TEST=y CONFIG_TRUE=y +CONFIG_FALSE=y +CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y # CONFIG_USLEEP is not set @@ -276,6 +277,10 @@ CONFIG_DMESG=y # CONFIG_MKSWAP is not set CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y + +# +# Common options for ls and more +# CONFIG_FEATURE_AUTOWIDTH=y # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set @@ -285,5 +290,9 @@ CONFIG_MOUNT=y # CONFIG_FEATURE_USE_DEVPS_PATCH is not set CONFIG_UMOUNT=y # CONFIG_FEATURE_MOUNT_FORCE is not set + +# +# Common options for mount/umount +# # CONFIG_FEATURE_MOUNT_LOOP is not set # CONFIG_FEATURE_MTAB_SUPPORT is not set |