From 3c96a0c4735814e1ada89913f537c099b3e1ecaa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 8 Jul 2010 18:51:46 +0200 Subject: [PATCH] busybox: update to busybox-1.17.0 Signed-off-by: Stephan Raue --- .../config/busybox-hosttools.conf | 87 ++- .../config/busybox-initramfs.conf | 87 ++- packages/sysutils/busybox/config/busybox.conf | 87 ++- .../patches/bootchartd-01-add_applet.diff | 495 ------------------ ...bootchartd-02-add_missing_parenthesis.diff | 33 -- ...otchartd-03-better_wording_in_comment.diff | 28 - packages/sysutils/busybox/url | 2 +- 7 files changed, 187 insertions(+), 632 deletions(-) delete mode 100644 packages/sysutils/busybox/patches/bootchartd-01-add_applet.diff delete mode 100644 packages/sysutils/busybox/patches/bootchartd-02-add_missing_parenthesis.diff delete mode 100644 packages/sysutils/busybox/patches/bootchartd-03-better_wording_in_comment.diff diff --git a/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf b/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf index 1729f99986..eaceb22051 100644 --- a/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf +++ b/packages/sysutils/busybox-hosttools/config/busybox-hosttools.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.16.1 -# Wed May 19 10:02:34 2010 +# Busybox version: 1.17.0 +# Thu Jul 8 17:24:55 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,11 +24,21 @@ 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_ASSUME_UNICODE is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set # CONFIG_LONG_OPTS is not set # CONFIG_FEATURE_DEVPTS is not set # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set # CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID_CONFIG is not set @@ -105,12 +115,14 @@ CONFIG_MONOTONIC_SYSCALL=y # # Archival Utilities # +# CONFIG_FEATURE_SEAMLESS_XZ is not set # CONFIG_FEATURE_SEAMLESS_LZMA is not set # CONFIG_FEATURE_SEAMLESS_BZ2 is not set # CONFIG_FEATURE_SEAMLESS_GZ is not set # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set # CONFIG_BUNZIP2 is not set # CONFIG_BZIP2 is not set # CONFIG_CPIO is not set @@ -134,19 +146,33 @@ CONFIG_MONOTONIC_SYSCALL=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set # CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_TO_COMMAND is not set # CONFIG_FEATURE_TAR_UNAME_GNAME is not set # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +# CONFIG_FEATURE_TAR_SELINUX is not set # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set # CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +# CONFIG_UNXZ is not set +# CONFIG_XZ is not set # CONFIG_UNZIP is not set # # Coreutils # # CONFIG_BASENAME is not set -# CONFIG_CAL is not set # CONFIG_CAT is not set +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_TEST is not set +# CONFIG_FEATURE_TEST_64 is not set +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +# CONFIG_CAL is not set # CONFIG_CATV is not set # CONFIG_CHGRP is not set # CONFIG_CHMOD is not set @@ -158,9 +184,6 @@ CONFIG_MONOTONIC_SYSCALL=y # CONFIG_CP is not set # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_CUT is not set -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_COMPAT is not set # CONFIG_DD is not set # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set @@ -241,12 +264,7 @@ CONFIG_MONOTONIC_SYSCALL=y # CONFIG_FEATURE_FANCY_TAIL is not set # CONFIG_TEE is not set # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -# CONFIG_TEST is not set -# CONFIG_FEATURE_TEST_64 is not set # CONFIG_TOUCH is not set -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_TRUE is not set # CONFIG_TTY is not set # CONFIG_UNAME is not set @@ -270,6 +288,7 @@ CONFIG_MONOTONIC_SYSCALL=y # Console Utilities # # CONFIG_CHVT is not set +# CONFIG_FGCONSOLE is not set # CONFIG_CLEAR is not set # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set @@ -288,6 +307,8 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_SETKEYCODES is not set # CONFIG_SETLOGCONS is not set # CONFIG_SHOWKEY is not set +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set # # Debian Utilities @@ -326,6 +347,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_SETOPTS is not set # CONFIG_FEATURE_VI_SET is not set # CONFIG_FEATURE_VI_WIN_RESIZE is not set +# CONFIG_FEATURE_VI_ASK_TERMINAL is not set # CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set # CONFIG_FEATURE_ALLOW_EXEC is not set @@ -368,6 +390,9 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # # Init Utilities # +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set # CONFIG_INIT is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set @@ -381,7 +406,6 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" # CONFIG_MESG is not set -# CONFIG_BOOTCHARTD is not set # # Login/Password Management Utilities @@ -403,8 +427,6 @@ CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_DELUSER is not set # CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set @@ -426,10 +448,12 @@ CONFIG_CRYPTPW=y # CONFIG_CHATTR is not set # CONFIG_FSCK is not set # CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set # # Linux Module Utilities # +# CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set @@ -460,6 +484,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities # +# CONFIG_REV is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set @@ -479,6 +504,7 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y # CONFIG_FEATURE_OSF_LABEL is not set # CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FINDFS is not set +# CONFIG_FLOCK is not set # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set @@ -550,11 +576,15 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y # CONFIG_UMOUNT is not set # CONFIG_FEATURE_UMOUNT_ALL is not set # CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set # CONFIG_FEATURE_MTAB_SUPPORT is not set # # Miscellaneous Utilities # +# CONFIG_CONSPY is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_BEEP is not set @@ -619,6 +649,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set # CONFIG_SETSID is not set @@ -635,6 +666,10 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # # Networking Utilities # +# CONFIG_NC is not set +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +# CONFIG_NC_110_COMPAT is not set # CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set @@ -708,9 +743,6 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NC is not set -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set # CONFIG_NETSTAT is not set # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set @@ -723,6 +755,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_PSCAN is not set # CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set # CONFIG_TELNET is not set # CONFIG_FEATURE_TELNET_TTYPE is not set # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set @@ -741,6 +774,8 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set @@ -754,16 +789,13 @@ CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +# CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set # CONFIG_WGET is not set # CONFIG_FEATURE_WGET_STATUSBAR is not set # CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_ZCIP is not set -# CONFIG_TCPSVD is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDPSVD is not set # # Print Utilities @@ -786,6 +818,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_SMEMCAP is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_KILL is not set @@ -848,9 +881,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # # Shells # -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_ASH is not set # CONFIG_ASH_BASH_COMPAT is not set # CONFIG_ASH_JOB_CONTROL is not set @@ -877,6 +907,12 @@ CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_LASH is not set # CONFIG_MSH is not set # CONFIG_SH_MATH_SUPPORT is not set @@ -893,6 +929,7 @@ CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set diff --git a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf index 8eaaa5c7ec..0f707db407 100644 --- a/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf +++ b/packages/sysutils/busybox-initramfs/config/busybox-initramfs.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.16.1 -# Wed May 19 10:01:56 2010 +# Busybox version: 1.17.0 +# Thu Jul 8 17:23:48 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,11 +24,21 @@ 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_ASSUME_UNICODE is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set # CONFIG_LONG_OPTS is not set CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set # CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID_CONFIG is not set @@ -105,12 +115,14 @@ CONFIG_FEATURE_COPYBUF_KB=4 # # Archival Utilities # +# CONFIG_FEATURE_SEAMLESS_XZ is not set # CONFIG_FEATURE_SEAMLESS_LZMA is not set # CONFIG_FEATURE_SEAMLESS_BZ2 is not set # CONFIG_FEATURE_SEAMLESS_GZ is not set # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set # CONFIG_BUNZIP2 is not set # CONFIG_BZIP2 is not set # CONFIG_CPIO is not set @@ -134,19 +146,33 @@ CONFIG_FEATURE_COPYBUF_KB=4 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set # CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_TO_COMMAND is not set # CONFIG_FEATURE_TAR_UNAME_GNAME is not set # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set +# CONFIG_FEATURE_TAR_SELINUX is not set # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set # CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +# CONFIG_UNXZ is not set +# CONFIG_XZ is not set # CONFIG_UNZIP is not set # # Coreutils # # CONFIG_BASENAME is not set -# CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +# CONFIG_CAL is not set # CONFIG_CATV is not set # CONFIG_CHGRP is not set # CONFIG_CHMOD is not set @@ -158,9 +184,6 @@ CONFIG_CHROOT=y # CONFIG_CP is not set # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_CUT is not set -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_COMPAT is not set # CONFIG_DD is not set # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set @@ -241,12 +264,7 @@ CONFIG_SYNC=y # CONFIG_FEATURE_FANCY_TAIL is not set # CONFIG_TEE is not set # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y # CONFIG_TOUCH is not set -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_TRUE is not set # CONFIG_TTY is not set # CONFIG_UNAME is not set @@ -274,6 +292,7 @@ CONFIG_USLEEP=y # Console Utilities # # CONFIG_CHVT is not set +# CONFIG_FGCONSOLE is not set # CONFIG_CLEAR is not set # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set @@ -292,6 +311,8 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_SETKEYCODES is not set # CONFIG_SETLOGCONS is not set # CONFIG_SHOWKEY is not set +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set # # Debian Utilities @@ -330,6 +351,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_SETOPTS is not set # CONFIG_FEATURE_VI_SET is not set # CONFIG_FEATURE_VI_WIN_RESIZE is not set +# CONFIG_FEATURE_VI_ASK_TERMINAL is not set # CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set # CONFIG_FEATURE_ALLOW_EXEC is not set @@ -372,6 +394,9 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # # Init Utilities # +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set # CONFIG_INIT is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set @@ -385,7 +410,6 @@ CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" # CONFIG_MESG is not set -# CONFIG_BOOTCHARTD is not set # # Login/Password Management Utilities @@ -407,8 +431,6 @@ CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_DELUSER is not set # CONFIG_GETTY is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set # CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set @@ -430,10 +452,12 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_CHATTR is not set # CONFIG_FSCK is not set # CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set # # Linux Module Utilities # +# CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set @@ -464,6 +488,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities # +# CONFIG_REV is not set # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set CONFIG_BLKID=y @@ -483,6 +508,7 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y # CONFIG_FEATURE_OSF_LABEL is not set # CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FINDFS is not set +# CONFIG_FLOCK is not set # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set @@ -558,11 +584,15 @@ CONFIG_FEATURE_UMOUNT_ALL=y # Common options for mount/umount # CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set # # Miscellaneous Utilities # +# CONFIG_CONSPY is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_BEEP is not set @@ -627,6 +657,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set # CONFIG_SETSID is not set @@ -643,6 +674,10 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # # Networking Utilities # +# CONFIG_NC is not set +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +# CONFIG_NC_110_COMPAT is not set # CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set @@ -716,9 +751,6 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NC is not set -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set # CONFIG_NETSTAT is not set # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set @@ -731,6 +763,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_PSCAN is not set # CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set # CONFIG_TELNET is not set # CONFIG_FEATURE_TELNET_TTYPE is not set # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set @@ -749,6 +782,8 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set @@ -762,16 +797,13 @@ CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +# CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set # CONFIG_WGET is not set # CONFIG_FEATURE_WGET_STATUSBAR is not set # CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_ZCIP is not set -# CONFIG_TCPSVD is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDPSVD is not set # # Print Utilities @@ -794,6 +826,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_SMEMCAP is not set # CONFIG_FREE is not set # CONFIG_FUSER is not set # CONFIG_KILL is not set @@ -856,9 +889,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # # Shells # -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y CONFIG_ASH_BASH_COMPAT=y # CONFIG_ASH_JOB_CONTROL is not set @@ -885,6 +915,12 @@ CONFIG_ASH_BUILTIN_TEST=y # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_FEATURE_BASH_IS_ASH=y +# CONFIG_FEATURE_BASH_IS_HUSH is not set +# CONFIG_FEATURE_BASH_IS_NONE is not set # CONFIG_LASH is not set # CONFIG_MSH is not set CONFIG_SH_MATH_SUPPORT=y @@ -901,6 +937,7 @@ CONFIG_FEATURE_SH_STANDALONE=y # CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_LOGREAD is not set diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index ddcfd58cf9..38eed25ce3 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.16.1 -# Wed May 19 10:01:29 2010 +# Busybox version: 1.17.0 +# Thu Jul 8 17:22:40 2010 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,11 +24,21 @@ 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_ASSUME_UNICODE is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set @@ -105,12 +115,14 @@ CONFIG_MONOTONIC_SYSCALL=y # # Archival Utilities # +CONFIG_FEATURE_SEAMLESS_XZ=y CONFIG_FEATURE_SEAMLESS_LZMA=y CONFIG_FEATURE_SEAMLESS_BZ2=y CONFIG_FEATURE_SEAMLESS_GZ=y # CONFIG_FEATURE_SEAMLESS_Z is not set # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set +# CONFIG_FEATURE_AR_CREATE is not set CONFIG_BUNZIP2=y CONFIG_BZIP2=y # CONFIG_CPIO is not set @@ -134,19 +146,33 @@ CONFIG_FEATURE_TAR_FROM=y # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set # CONFIG_FEATURE_LZMA_FAST is not set +# CONFIG_LZMA is not set +CONFIG_UNXZ=y +CONFIG_XZ=y # CONFIG_UNZIP is not set # # Coreutils # # CONFIG_BASENAME is not set -# CONFIG_CAL is not set CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_CAL is not set # CONFIG_CATV is not set # CONFIG_CHGRP is not set CONFIG_CHMOD=y @@ -158,9 +184,6 @@ CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_FEATURE_DATE_COMPAT=y # CONFIG_DD is not set # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set @@ -241,12 +264,7 @@ CONFIG_TAIL=y # CONFIG_FEATURE_FANCY_TAIL is not set CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y # CONFIG_TRUE is not set # CONFIG_TTY is not set CONFIG_UNAME=y @@ -282,6 +300,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # Console Utilities # # CONFIG_CHVT is not set +# CONFIG_FGCONSOLE is not set CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set @@ -300,6 +319,8 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_SETKEYCODES is not set # CONFIG_SETLOGCONS is not set # CONFIG_SHOWKEY is not set +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +# CONFIG_FEATURE_LOADFONT_RAW is not set # # Debian Utilities @@ -338,6 +359,7 @@ CONFIG_FEATURE_VI_READONLY=y CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y @@ -380,6 +402,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # +CONFIG_BOOTCHARTD=y +CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y +CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y # CONFIG_INIT is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set @@ -393,7 +418,6 @@ CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" # CONFIG_MESG is not set -CONFIG_BOOTCHARTD=y # # Login/Password Management Utilities @@ -415,8 +439,6 @@ CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_DELUSER is not set CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y CONFIG_LOGIN=y CONFIG_PAM=y CONFIG_LOGIN_SCRIPTS=y @@ -438,10 +460,12 @@ CONFIG_FEATURE_SU_CHECKS_SHELLS=y # CONFIG_CHATTR is not set # CONFIG_FSCK is not set # CONFIG_LSATTR is not set +# CONFIG_TUNE2FS is not set # # Linux Module Utilities # +# CONFIG_MODINFO is not set # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set @@ -472,6 +496,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # # Linux System Utilities # +# CONFIG_REV is not set CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y # CONFIG_BLKID is not set @@ -491,6 +516,7 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y # CONFIG_FEATURE_OSF_LABEL is not set # CONFIG_FEATURE_FDISK_ADVANCED is not set CONFIG_FINDFS=y +# CONFIG_FLOCK is not set # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_EXT2 is not set @@ -562,11 +588,15 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y # CONFIG_UMOUNT is not set # CONFIG_FEATURE_UMOUNT_ALL is not set # CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set # CONFIG_FEATURE_MTAB_SUPPORT is not set # # Miscellaneous Utilities # +# CONFIG_CONSPY is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_BEEP is not set @@ -631,6 +661,7 @@ CONFIG_MOUNTPOINT=y # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set # CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set # CONFIG_SETSID is not set @@ -647,6 +678,10 @@ CONFIG_TTYSIZE=y # # Networking Utilities # +CONFIG_NC=y +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +CONFIG_NC_110_COMPAT=y # CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set @@ -720,9 +755,6 @@ CONFIG_FEATURE_IP_ROUTE=y # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NC=y -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set @@ -735,6 +767,7 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set +# CONFIG_TCPSVD is not set # CONFIG_TELNET is not set # CONFIG_FEATURE_TELNET_TTYPE is not set # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set @@ -753,6 +786,8 @@ CONFIG_ROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set +# CONFIG_FEATURE_TUNCTL_UG is not set # CONFIG_UDHCPD is not set # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set @@ -766,16 +801,13 @@ CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" +# CONFIG_UDPSVD is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_ZCIP is not set -# CONFIG_TCPSVD is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDPSVD is not set # # Print Utilities @@ -798,6 +830,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +# CONFIG_SMEMCAP is not set CONFIG_FREE=y CONFIG_FUSER=y CONFIG_KILL=y @@ -860,9 +893,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # # Shells # -# CONFIG_FEATURE_SH_IS_ASH is not set -# CONFIG_FEATURE_SH_IS_HUSH is not set -CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_ASH is not set # CONFIG_ASH_BASH_COMPAT is not set # CONFIG_ASH_JOB_CONTROL is not set @@ -889,6 +919,12 @@ CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_HUSH_LOCAL is not set # CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_LASH is not set # CONFIG_MSH is not set # CONFIG_SH_MATH_SUPPORT is not set @@ -905,6 +941,7 @@ CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y # CONFIG_FEATURE_REMOTE_LOG is not set CONFIG_FEATURE_SYSLOGD_DUP=y +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=32 CONFIG_LOGREAD=y diff --git a/packages/sysutils/busybox/patches/bootchartd-01-add_applet.diff b/packages/sysutils/busybox/patches/bootchartd-01-add_applet.diff deleted file mode 100644 index 4803c9b765..0000000000 --- a/packages/sysutils/busybox/patches/bootchartd-01-add_applet.diff +++ /dev/null @@ -1,495 +0,0 @@ -From ff027d6f50bfa24228e230b84a3297c51d37d000 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Tue, 04 May 2010 13:45:25 +0000 -Subject: bootchartd: new applet - -Usage: bootchartd start [PROG ARGS]|init|stop - -Create /var/log/bootchart.tgz with boot chart data - -Options: -start: start background logging; with PROG, run PROG, then kill -logging with USR1 -stop: send USR1 to all bootchartd processes -init: start background logging; stop when getty/gdm is seen (for init scripts) -Under PID 1: as init, then exec $bootchart_init, /init, /sbin/init - -function old new delta -bootchartd_main - 907 +907 -dump_procs - 353 +353 -packed_usage 26566 26735 +169 -dump_file - 91 +91 -static.dirs - 23 +23 -applet_names 2176 2187 +11 -applet_main 1284 1288 +4 -applet_nameofs 642 644 +2 ------------------------------------------------------------------------------- -(add/remove: 5/0 grow/shrink: 4/0 up/down: 1560/0) Total: 1560 bytes - -Signed-off-by: Denys Vlasenko ---- -diff --git a/include/applets.h b/include/applets.h -index ef5dd78..dfb20b9 100644 ---- a/include/applets.h -+++ b/include/applets.h -@@ -83,6 +83,7 @@ IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) - //IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP)) - IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) - IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP)) -+IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP)) - IF_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) - IF_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP)) - IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP, bzcat)) -diff --git a/include/usage.h b/include/usage.h -index 2c2a90d..636d019 100644 ---- a/include/usage.h -+++ b/include/usage.h -@@ -154,18 +154,15 @@ - "\n -r Repetitions" \ - "\n -n Start new tone" \ - --#define fbsplash_trivial_usage \ -- "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]" --#define fbsplash_full_usage "\n\n" \ -- "Options:" \ -- "\n -s Image" \ -- "\n -c Hide cursor" \ -- "\n -d Framebuffer device (default /dev/fb0)" \ -- "\n -i Config file (var=value):" \ -- "\n BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" \ -- "\n BAR_R,BAR_G,BAR_B" \ -- "\n -f Control pipe (else exit after drawing image)" \ -- "\n commands: 'NN' (% for progress bar) or 'exit'" \ -+#define bootchartd_trivial_usage \ -+ "start [PROG ARGS]|stop|init" -+#define bootchartd_full_usage "\n\n" \ -+ "Create /var/log/bootchart.tgz with boot chart data\n" \ -+ "\nOptions:" \ -+ "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1" \ -+ "\nstop: send USR1 to all bootchartd processes" \ -+ "\ninit: start background logging; stop when getty/xdm is seen (for init scripts)" \ -+ "\nUnder PID 1: as init, then exec $bootchart_init, /init, /sbin/init" \ - - #define brctl_trivial_usage \ - "COMMAND [BRIDGE [INTERFACE]]" -@@ -1174,6 +1171,19 @@ - "$ echo $?\n" \ - "1\n" - -+#define fbsplash_trivial_usage \ -+ "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]" -+#define fbsplash_full_usage "\n\n" \ -+ "Options:" \ -+ "\n -s Image" \ -+ "\n -c Hide cursor" \ -+ "\n -d Framebuffer device (default /dev/fb0)" \ -+ "\n -i Config file (var=value):" \ -+ "\n BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" \ -+ "\n BAR_R,BAR_G,BAR_B" \ -+ "\n -f Control pipe (else exit after drawing image)" \ -+ "\n commands: 'NN' (% for progress bar) or 'exit'" \ -+ - #define fbset_trivial_usage \ - "[OPTIONS] [MODE]" - #define fbset_full_usage "\n\n" \ -diff --git a/init/Config.in b/init/Config.in -index 3d99d47..76d5092 100644 ---- a/init/Config.in -+++ b/init/Config.in -@@ -120,4 +120,18 @@ config MESG - Mesg controls access to your terminal by others. It is typically - used to allow or disallow other users to write to your terminal - -+config BOOTCHARTD -+ bool "bootchartd" -+ default n -+ help -+ bootchartd is commonly used to profile the boot process -+ for the purpose of speeding it up. In this case, it is started -+ by the kernel as the init process. This is configured by adding -+ the init=/sbin/bootchartd option to the kernel command line. -+ -+ It can also be used to monitor the resource usage of a specific -+ application or the running system in general. In this case, -+ bootchartd is started interactively by running bootchartd start -+ and stopped using bootchartd stop. -+ - endmenu -diff --git a/init/Kbuild b/init/Kbuild -index c060f3a..ce3f302 100644 ---- a/init/Kbuild -+++ b/init/Kbuild -@@ -5,6 +5,7 @@ - # Licensed under the GPL v2, see the file LICENSE in this tarball. - - lib-y:= --lib-$(CONFIG_HALT) += halt.o --lib-$(CONFIG_INIT) += init.o --lib-$(CONFIG_MESG) += mesg.o -+lib-$(CONFIG_HALT) += halt.o -+lib-$(CONFIG_INIT) += init.o -+lib-$(CONFIG_MESG) += mesg.o -+lib-$(CONFIG_BOOTCHARTD) += bootchartd.o -diff --git a/init/bootchartd.c b/init/bootchartd.c -new file mode 100644 -index 0000000..fccaace ---- a/dev/null -+++ b/init/bootchartd.c -@@ -0,0 +1,355 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. -+ */ -+#include "libbb.h" -+#include -+#ifndef MS_SILENT -+# define MS_SILENT (1 << 15) -+#endif -+#ifndef MNT_DETACH -+# define MNT_DETACH 0x00000002 -+#endif -+ -+#define BC_VERSION_STR "0.8" -+ -+/* For debugging, set to 0: -+ * strace won't work with DO_SIGNAL_SYNC set to 1. -+ */ -+#define DO_SIGNAL_SYNC 1 -+ -+ -+//Not supported: $PWD/bootchartd.conf and /etc/bootchartd.conf -+ -+//# tmpfs size -+//# (32 MB should suffice for ~20 minutes worth of log data, but YMMV) -+//TMPFS_SIZE=32m -+// -+//# Sampling period (in seconds) -+//SAMPLE_PERIOD=0.2 -+// -+//# Whether to enable and store BSD process accounting information. The -+//# kernel needs to be configured to enable v3 accounting -+//# (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities -+//# is also required. -+//PROCESS_ACCOUNTING="no" -+// -+//# Tarball for the various boot log files -+//BOOTLOG_DEST=/var/log/bootchart.tgz -+// -+//# Whether to automatically stop logging as the boot process completes. -+//# The logger will look for known processes that indicate bootup completion -+//# at a specific runlevel (e.g. gdm-binary, mingetty, etc.). -+//AUTO_STOP_LOGGER="yes" -+// -+//# Whether to automatically generate the boot chart once the boot logger -+//# completes. The boot chart will be generated in $AUTO_RENDER_DIR. -+//# Note that the bootchart package must be installed. -+//AUTO_RENDER="no" -+// -+//# Image format to use for the auto-generated boot chart -+//# (choose between png, svg and eps). -+//AUTO_RENDER_FORMAT="png" -+// -+//# Output directory for auto-generated boot charts -+//AUTO_RENDER_DIR="/var/log" -+ -+ -+/* Globals */ -+struct globals { -+ char jiffy_line[sizeof(bb_common_bufsiz1)]; -+} FIX_ALIASING; -+#define G (*(struct globals*)&bb_common_bufsiz1) -+#define INIT_G() do { } while (0) -+ -+static void dump_file(FILE *fp, const char *filename) -+{ -+ int fd = open(filename, O_RDONLY); -+ if (fd >= 0) { -+ fputs(G.jiffy_line, fp); -+ fflush(fp); -+ bb_copyfd_eof(fd, fileno(fp)); -+ close(fd); -+ fputc('\n', fp); -+ } -+} -+ -+static int dump_procs(FILE *fp, int look_for_login_process) -+{ -+ struct dirent *entry; -+ DIR *dir = opendir("/proc"); -+ int found_login_process = 0; -+ -+ fputs(G.jiffy_line, fp); -+ while ((entry = readdir(dir)) != NULL) { -+ char name[sizeof("/proc/%u/cmdline") + sizeof(int)*3]; -+ int stat_fd; -+ unsigned pid = bb_strtou(entry->d_name, NULL, 10); -+ if (errno) -+ continue; -+ -+ /* Android's version reads /proc/PID/cmdline and extracts -+ * non-truncated process name. Do we want to do that? */ -+ -+ sprintf(name, "/proc/%u/stat", pid); -+ stat_fd = open(name, O_RDONLY); -+ if (stat_fd >= 0) { -+ char *p; -+ char stat_line[4*1024]; -+ int rd = safe_read(stat_fd, stat_line, sizeof(stat_line)-2); -+ -+ close(stat_fd); -+ if (rd < 0) -+ continue; -+ stat_line[rd] = '\0'; -+ p = strchrnul(stat_line, '\n'); -+ *p++ = '\n'; -+ *p = '\0'; -+ fputs(stat_line, fp); -+ if (!look_for_login_process) -+ continue; -+ p = strchr(stat_line, '('); -+ if (!p) -+ continue; -+ p++; -+ strchrnul(p, ')')[0] = '\0'; -+ /* If is gdm, kdm or a getty? */ -+ if (((p[0] == 'g' || p[0] == 'k' || p[0] == 'x') && p[1] == 'd' && p[2] == 'm') -+ || strstr(p, "getty") -+ ) { -+ found_login_process = 1; -+ } -+ } -+ } -+ closedir(dir); -+ fputc('\n', fp); -+ return found_login_process; -+} -+ -+static char *make_tempdir(const char *prog) -+{ -+ char template[] = "/tmp/bootchart.XXXXXX"; -+ char *tempdir = xstrdup(mkdtemp(template)); -+ if (!tempdir) { -+ /* /tmp is not writable (happens when we are used as init). -+ * Try to mount a tmpfs, them cd and lazily unmount it. -+ * Since we unmount it at once, we can mount it anywhere. -+ * Try a few locations which are likely ti exist. -+ */ -+ static const char dirs[] = "/mnt\0""/tmp\0""/boot\0""/proc\0"; -+ const char *try_dir = dirs; -+ while (mount("none", try_dir, "tmpfs", MS_SILENT, "size=16m") != 0) { -+ try_dir += strlen(try_dir) + 1; -+ if (!try_dir[0]) -+ bb_perror_msg_and_die("can't %smount tmpfs", ""); -+ } -+ //bb_error_msg("mounted tmpfs on %s", try_dir); -+ xchdir(try_dir); -+ if (umount2(try_dir, MNT_DETACH) != 0) { -+ bb_perror_msg_and_die("can't %smount tmpfs", "un"); -+ } -+ } else { -+ xchdir(tempdir); -+ } -+ { -+ FILE *header_fp = xfopen("header", "w"); -+ if (prog) -+ fprintf(header_fp, "profile.process = %s\n", prog); -+ fputs("version = "BC_VERSION_STR"\n", header_fp); -+ fclose(header_fp); -+ } -+ -+ return tempdir; -+} -+ -+static void do_logging(void) -+{ -+ //# Enable process accounting if configured -+ //if [ "$PROCESS_ACCOUNTING" = "yes" ]; then -+ // [ -e kernel_pacct ] || : > kernel_pacct -+ // accton kernel_pacct -+ //fi -+ -+ FILE *proc_stat = xfopen("proc_stat.log", "w"); -+ FILE *proc_diskstats = xfopen("proc_diskstats.log", "w"); -+ //FILE *proc_netdev = xfopen("proc_netdev.log", "w"); -+ FILE *proc_ps = xfopen("proc_ps.log", "w"); -+ int look_for_login_process = (getppid() == 1); -+ unsigned count = 60*1000*1000 / 200*1000; /* ~1 minute */ -+ -+ while (--count && !bb_got_signal) { -+ char *p; -+ int len = open_read_close("/proc/uptime", G.jiffy_line, sizeof(G.jiffy_line)-2); -+ if (len < 0) -+ goto wait_more; -+ /* /proc/uptime has format "NNNNNN.MM NNNNNNN.MM" */ -+ /* we convert it to "NNNNNNMM\n" (using first value) */ -+ G.jiffy_line[len] = '\0'; -+ p = strchr(G.jiffy_line, '.'); -+ if (!p) -+ goto wait_more; -+ while (isdigit(*++p)) -+ p[-1] = *p; -+ p[-1] = '\n'; -+ p[0] = '\0'; -+ -+ dump_file(proc_stat, "/proc/stat"); -+ dump_file(proc_diskstats, "/proc/diskstats"); -+ //dump_file(proc_netdev, "/proc/net/dev"); -+ if (dump_procs(proc_ps, look_for_login_process)) { -+ /* dump_procs saw a getty or {g,k,x}dm -+ * stop logging in 2 seconds: -+ */ -+ if (count > 2*1000*1000 / 200*1000) -+ count = 2*1000*1000 / 200*1000; -+ } -+ fflush_all(); -+ wait_more: -+ usleep(200*1000); -+ } -+ -+ // [ -e kernel_pacct ] && accton off -+} -+ -+static void finalize(char *tempdir) -+{ -+ //# Stop process accounting if configured -+ //local pacct= -+ //[ -e kernel_pacct ] && pacct=kernel_pacct -+ -+ //( -+ // echo "version = $VERSION" -+ // echo "title = Boot chart for $( hostname | sed q ) ($( date ))" -+ // echo "system.uname = $( uname -srvm | sed q )" -+ // echo "system.release = $( sed q /etc/SuSE-release )" -+ // echo "system.cpu = $( grep '^model name' /proc/cpuinfo | sed q ) ($cpucount)" -+ // echo "system.kernel.options = $( sed q /proc/cmdline )" -+ //) >> header -+ -+ /* Package log files */ -+ system("tar -zcf /var/log/bootchart.tgz header *.log"); // + $pacct -+ /* Clean up (if we are not in detached tmpfs) */ -+ if (tempdir) { -+ unlink("header"); -+ unlink("proc_stat.log"); -+ unlink("proc_diskstats.log"); -+ //unlink("proc_netdev.log"); -+ unlink("proc_ps.log"); -+ rmdir(tempdir); -+ } -+ -+ /* shell-based bootchartd tries to run /usr/bin/bootchart if $AUTO_RENDER=yes: -+ * /usr/bin/bootchart -o "$AUTO_RENDER_DIR" -f $AUTO_RENDER_FORMAT "$BOOTLOG_DEST" -+ */ -+} -+ -+/* Usage: -+ * bootchartd start [PROG ARGS]: start logging in background, USR1 stops it. -+ * With PROG, runs PROG, then kills background logging. -+ * bootchartd stop: same as "killall -USR1 bootchartd" -+ * bootchartd init: start logging in background -+ * Stop when getty/gdm is seen (if AUTO_STOP_LOGGER = yes). -+ * Meant to be used from init scripts. -+ * bootchartd (pid==1): as init, but then execs $bootchart_init, /init, /sbin/init -+ * Meant to be used as kernel's init process. -+ */ -+int bootchartd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -+int bootchartd_main(int argc UNUSED_PARAM, char **argv) -+{ -+ pid_t parent_pid, logger_pid; -+ smallint cmd; -+ enum { -+ CMD_STOP = 0, -+ CMD_START, -+ CMD_INIT, -+ CMD_PID1, /* used to mark pid 1 case */ -+ }; -+ -+ INIT_G(); -+ -+ parent_pid = getpid(); -+ if (argv[1]) { -+ cmd = index_in_strings("stop\0""start\0""init\0", argv[1]); -+ if (cmd < 0) -+ bb_show_usage(); -+ if (cmd == CMD_STOP) { -+ pid_t *pidList = find_pid_by_name("bootchartd"); -+ while (*pidList != 0) { -+ if (*pidList != parent_pid) -+ kill(*pidList, SIGUSR1); -+ pidList++; -+ } -+ return EXIT_SUCCESS; -+ } -+ } else { -+ if (parent_pid != 1) -+ bb_show_usage(); -+ cmd = CMD_PID1; -+ } -+ -+ /* Here we are in START or INIT state. Create logger child: */ -+ logger_pid = fork_or_rexec(argv); -+ -+ if (logger_pid == 0) { /* child */ -+ char *tempdir; -+ -+ bb_signals(0 -+ + (1 << SIGUSR1) -+ + (1 << SIGUSR2) -+ + (1 << SIGTERM) -+ + (1 << SIGQUIT) -+ + (1 << SIGINT) -+ + (1 << SIGHUP) -+ , record_signo); -+ -+ if (DO_SIGNAL_SYNC) -+ /* Inform parent that we are ready */ -+ raise(SIGSTOP); -+ -+ /* If we started by kernel, PATH might be not set. -+ * And in order to run tar we may need PATH to be set: -+ */ -+ if (cmd == CMD_PID1 && !getenv("PATH")) -+ putenv((char*)bb_PATH_root_path); -+ tempdir = make_tempdir(cmd == CMD_START ? argv[2] : NULL); -+ do_logging(); -+ finalize(tempdir); -+ return EXIT_SUCCESS; -+ } -+ -+ /* parent */ -+ -+ if (DO_SIGNAL_SYNC) { -+ /* Wait for logger child to set handlers, then unpause it. -+ * Otherwise with short-lived PROG (e.g. "bootchartd start true") -+ * we might send SIGUSR1 before logger sets its handler. -+ */ -+ waitpid(logger_pid, NULL, WUNTRACED); -+ kill(logger_pid, SIGCONT); -+ } -+ -+ if (cmd == CMD_PID1) { -+ char *bootchart_init = getenv("bootchart_init"); -+ if (bootchart_init) -+ execl(bootchart_init, bootchart_init, NULL); -+ execl("/init", "init", NULL); -+ execl("/sbin/init", "init", NULL); -+ bb_perror_msg_and_die("can't exec '%s'", "/sbin/init"); -+ } -+ -+ if (cmd == CMD_START && argv[2]) { /* "start PROG ARGS" */ -+ pid_t pid = vfork(); -+ if (pid < 0) -+ bb_perror_msg_and_die("vfork"); -+ if (pid == 0) { /* child */ -+ argv += 2; -+ execvp(argv[0], argv); -+ bb_perror_msg_and_die("can't exec '%s'", argv[0]); -+ } -+ /* parent */ -+ waitpid(pid, NULL, 0); -+ kill(logger_pid, SIGUSR1); -+ } -+ -+ return EXIT_SUCCESS; -+} --- -cgit v0.8.2.1 diff --git a/packages/sysutils/busybox/patches/bootchartd-02-add_missing_parenthesis.diff b/packages/sysutils/busybox/patches/bootchartd-02-add_missing_parenthesis.diff deleted file mode 100644 index aa108256a6..0000000000 --- a/packages/sysutils/busybox/patches/bootchartd-02-add_missing_parenthesis.diff +++ /dev/null @@ -1,33 +0,0 @@ -From e7f1e5ca1de60db1336f0ec85b1c9df55f6402b7 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Tue, 04 May 2010 15:34:37 +0000 -Subject: bootchartd: add missing parenthesis - -Signed-off-by: Denys Vlasenko ---- -diff --git a/init/bootchartd.c b/init/bootchartd.c -index fccaace..9c43e33 100644 ---- a/init/bootchartd.c -+++ b/init/bootchartd.c -@@ -175,7 +175,7 @@ static void do_logging(void) - //FILE *proc_netdev = xfopen("proc_netdev.log", "w"); - FILE *proc_ps = xfopen("proc_ps.log", "w"); - int look_for_login_process = (getppid() == 1); -- unsigned count = 60*1000*1000 / 200*1000; /* ~1 minute */ -+ unsigned count = 60*1000*1000 / (200*1000); /* ~1 minute */ - - while (--count && !bb_got_signal) { - char *p; -@@ -200,8 +200,8 @@ static void do_logging(void) - /* dump_procs saw a getty or {g,k,x}dm - * stop logging in 2 seconds: - */ -- if (count > 2*1000*1000 / 200*1000) -- count = 2*1000*1000 / 200*1000; -+ if (count > 2*1000*1000 / (200*1000)) -+ count = 2*1000*1000 / (200*1000); - } - fflush_all(); - wait_more: --- -cgit v0.8.2.1 diff --git a/packages/sysutils/busybox/patches/bootchartd-03-better_wording_in_comment.diff b/packages/sysutils/busybox/patches/bootchartd-03-better_wording_in_comment.diff deleted file mode 100644 index 9615083e73..0000000000 --- a/packages/sysutils/busybox/patches/bootchartd-03-better_wording_in_comment.diff +++ /dev/null @@ -1,28 +0,0 @@ -From b8ba6b66f5d730efcf13dbbb3f9362dd6840d93b Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Tue, 04 May 2010 22:40:15 +0000 -Subject: bootchartd: better wording in comment - -Signed-off-by: Denys Vlasenko ---- -diff --git a/init/bootchartd.c b/init/bootchartd.c -index 9c43e33..9faf14d 100644 ---- a/init/bootchartd.c -+++ b/init/bootchartd.c -@@ -306,11 +306,12 @@ int bootchartd_main(int argc UNUSED_PARAM, char **argv) - /* Inform parent that we are ready */ - raise(SIGSTOP); - -- /* If we started by kernel, PATH might be not set. -- * And in order to run tar we may need PATH to be set: -+ /* If we are started by kernel, PATH might be unset. -+ * In order to find "tar", let's set some sane PATH: - */ - if (cmd == CMD_PID1 && !getenv("PATH")) - putenv((char*)bb_PATH_root_path); -+ - tempdir = make_tempdir(cmd == CMD_START ? argv[2] : NULL); - do_logging(); - finalize(tempdir); --- -cgit v0.8.2.1 diff --git a/packages/sysutils/busybox/url b/packages/sysutils/busybox/url index 9f1bce2062..c422cfd17f 100644 --- a/packages/sysutils/busybox/url +++ b/packages/sysutils/busybox/url @@ -1 +1 @@ -http://busybox.net/downloads/busybox-1.16.2.tar.bz2 \ No newline at end of file +http://busybox.net/downloads/busybox-1.17.0.tar.bz2