From 162a23c2200db0ddefb960ecf88ef3f7e16f949c Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 13 Dec 2006 09:14:10 +0000 Subject: update busybox defaults a bit --- package/busybox/busybox-1.2.2.1.config | 360 ++++++++++++++++++++++++--------- package/busybox/busybox.mk | 59 ++++-- 2 files changed, 305 insertions(+), 114 deletions(-) (limited to 'package') diff --git a/package/busybox/busybox-1.2.2.1.config b/package/busybox/busybox-1.2.2.1.config index 5026823a8..78b043a34 100644 --- a/package/busybox/busybox-1.2.2.1.config +++ b/package/busybox/busybox-1.2.2.1.config @@ -3,44 +3,81 @@ # HAVE_DOT_CONFIG=y +# +# Busybox Settings +# + # # General Configuration # +# CONFIG_NITPICK is not set # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_COMPRESS_USAGE is not set # CONFIG_FEATURE_INSTALLER is not set # CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set +CONFIG_GETOPT_LONG=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # # CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y # USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" +CROSS_COMPILER_PREFIX="" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y # # Installation Options # # CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set PREFIX="./_install" +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + # # Archival Utilities # # CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set CONFIG_BUNZIP2=y # CONFIG_CPIO is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set CONFIG_GZIP=y @@ -49,19 +86,25 @@ CONFIG_GZIP=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set # CONFIG_FEATURE_TAR_FROM is not set CONFIG_FEATURE_TAR_GZIP=y # CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNZIP=y # # Common options for cpio and tar # # CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set # # Coreutils @@ -69,10 +112,12 @@ CONFIG_UNZIP=y CONFIG_BASENAME=y # CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_CATV is not set CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y +# CONFIG_CKSUM is not set CONFIG_CMP=y # CONFIG_COMM is not set CONFIG_CP=y @@ -80,17 +125,24 @@ CONFIG_CUT=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_BINARY is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_FEATURE_DIFF_MINIMAL is not set CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y -# CONFIG_PRINTENV is not set +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y @@ -98,6 +150,7 @@ CONFIG_HEAD=y CONFIG_HOSTID=y CONFIG_ID=y CONFIG_INSTALL=y +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y CONFIG_LOGNAME=y @@ -109,13 +162,18 @@ CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y CONFIG_MD5SUM=y CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set # CONFIG_MKFIFO is not set CONFIG_MKNOD=y CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set # CONFIG_NICE is not set +# CONFIG_NOHUP is not set # CONFIG_OD is not set +# CONFIG_PRINTENV is not set # CONFIG_PRINTF is not set CONFIG_PWD=y # CONFIG_REALPATH is not set @@ -126,8 +184,9 @@ CONFIG_SHA1SUM=y CONFIG_SLEEP=y # CONFIG_FEATURE_FANCY_SLEEP is not set CONFIG_SORT=y -CONFIG_SORT_BIG=y +CONFIG_FEATURE_SORT_BIG=y # CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y @@ -136,13 +195,11 @@ CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y # CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y @@ -162,7 +219,7 @@ CONFIG_YES=y CONFIG_FEATURE_PRESERVE_HARDLINKS=y # -# Common options for ls and more +# Common options for ls, more and telnet # CONFIG_FEATURE_AUTOWIDTH=y @@ -187,7 +244,10 @@ CONFIG_DEALLOCVT=y # CONFIG_LOADKMAP is not set CONFIG_OPENVT=y CONFIG_RESET=y +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set # # Debian Utilities @@ -197,19 +257,18 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_WHICH=y -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_LSATTR is not set - # # Editors # # CONFIG_AWK is not set +# CONFIG_FEATURE_AWK_MATH is not set +# CONFIG_ED is not set # CONFIG_PATCH is not set CONFIG_SED=y CONFIG_VI=y @@ -228,12 +287,15 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # Finding Utilities # CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y CONFIG_FEATURE_FIND_MTIME=y +# CONFIG_FEATURE_FIND_MMIN is not set CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y @@ -248,25 +310,28 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # Init Utilities # CONFIG_INIT=y +# CONFIG_DEBUG_INIT is not set CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_INITRD=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set +CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +CONFIG_FEATURE_INITRD=y CONFIG_HALT=y -CONFIG_POWEROFF=y -CONFIG_REBOOT=y # CONFIG_MESG is not set # # Login/Password Management Utilities # +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set CONFIG_ADDGROUP=y CONFIG_DELGROUP=y CONFIG_ADDUSER=y CONFIG_DELUSER=y CONFIG_GETTY=y -# CONFIG_FEATURE_U_W_TMP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set CONFIG_LOGIN=y CONFIG_FEATURE_SECURETTY=y CONFIG_PASSWD=y @@ -275,56 +340,159 @@ CONFIG_SULOGIN=y CONFIG_VLOCK=y # -# Common options for adduser, deluser, login, su +# Linux Ext2 FS Progs # -CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_2_4_MODULES=y +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +CONFIG_FDFORMAT=y +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +# CONFIG_LOSETUP is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set # # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set # CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set # CONFIG_CRONTAB is not set CONFIG_DC=y # CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set # CONFIG_EJECT is not set # CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set # CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set CONFIG_MT=y +# CONFIG_RUNLEVEL is not set # CONFIG_RX is not set CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set CONFIG_TIME=y # CONFIG_WATCHDOG is not set -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y -CONFIG_MODPROBE=y -CONFIG_RMMOD=y -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y - # # Networking Utilities # # CONFIG_FEATURE_IPV6 is not set # CONFIG_ARPING is not set +# CONFIG_DNSD is not set # CONFIG_ETHER_WAKE is not set # CONFIG_FAKEIDENTD is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -339,56 +507,86 @@ CONFIG_FEATURE_IFUPDOWN_IPV4=y # CONFIG_FEATURE_IFUPDOWN_IPX is not set # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set # CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set # CONFIG_IP is not set -# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set # CONFIG_NC is not set +# CONFIG_NC_GAPING_SECURITY_HOLE is not set CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y CONFIG_PING=y CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set CONFIG_ROUTE=y CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set # CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set # CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set # CONFIG_TRACEROUTE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # # udhcp Server/Client # -CONFIG_UDHCPD=y -CONFIG_UDHCPC=y -CONFIG_DUMPLEASES=y +# CONFIG_APP_UDHCPD is not set +CONFIG_APP_UDHCPC=y +# CONFIG_APP_DUMPLEASES is not set CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_ZCIP is not set # # Process Utilities # CONFIG_FREE=y +# CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y # CONFIG_RENICE is not set +# CONFIG_BB_SYSCTL is not set # CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set CONFIG_UPTIME=y -# CONFIG_SYSCTL is not set # -# Another Bourne-like Shell +# Shells # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set @@ -401,15 +599,19 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y CONFIG_ASH_MATH_SUPPORT_64=y # CONFIG_ASH_GETOPTS is not set +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set @@ -420,6 +622,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set CONFIG_FEATURE_COMMAND_HISTORY=15 CONFIG_FEATURE_COMMAND_SAVEHISTORY=y CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y @@ -433,51 +636,8 @@ CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -CONFIG_GETOPT=y -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -# CONFIG_LOSETUP is not set -# CONFIG_MKSWAP is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -# CONFIG_NFSMOUNT is not set -CONFIG_UMOUNT=y -# CONFIG_FEATURE_MOUNT_FORCE is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_READPROFILE is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index cf47937b4..0ac97489d 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,17 +4,34 @@ # ############################################################# +ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y) +BUSYBOX_VER:=1.0.1 +BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER) +BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2 +BUSYBOX_SITE:=http://www.busybox.net/downloads +endif + +ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y) +BUSYBOX_VER:=1.1.3 +BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER) +BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2 +BUSYBOX_SITE:=http://www.busybox.net/downloads +endif + +ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y) +BUSYBOX_VER:=1.2.2.1 +BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER) +BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2 +BUSYBOX_SITE:=http://www.busybox.net/downloads +endif + ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y) # Be aware that this changes daily.... BUSYBOX_DIR:=$(BUILD_DIR)/busybox BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2 BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots -else -BUSYBOX_VER:=1.2.2.1 -BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER) -BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2 -BUSYBOX_SITE:=http://www.busybox.net/downloads endif + BUSYBOX_UNZIP=$(BZCAT) BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG))) @@ -37,15 +54,28 @@ endif $(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE) cp $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config - if [ -f $(BUSYBOX_DIR)/Rules.mak ]; then \ - $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\ - PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak ; \ - else \ - $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ - $(BUSYBOX_DIR)/.config ; \ - $(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ - $(BUSYBOX_DIR)/.config ; \ - fi +ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_0_1)),y) + $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \ + $(BUSYBOX_DIR)/Rules.mak ; +endif +ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_1_3)),y) + $(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ + $(BUSYBOX_DIR)/.config ; + $(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \ + $(BUSYBOX_DIR)/.config ; +endif +ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_2_2_1)),y) + $(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ + $(BUSYBOX_DIR)/.config ; + $(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ + $(BUSYBOX_DIR)/.config ; +endif +ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y) + $(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ + $(BUSYBOX_DIR)/.config ; + $(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ + $(BUSYBOX_DIR)/.config ; +endif ifeq ($(BR2_LARGEFILE),y) $(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config else @@ -56,6 +86,7 @@ endif CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig touch $(BUSYBOX_DIR)/.configured + $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \ -- cgit v1.2.3