From 632641fed22bfedfd68601d29ed5daeacb10e40e Mon Sep 17 00:00:00 2001 From: orchidman Date: Wed, 2 Nov 2011 10:25:03 +0100 Subject: busybox correction --- extra/busybox/.footprint.x86_64 | 14 +++++-- extra/busybox/.md5sum.x86_64 | 4 +- extra/busybox/Pkgfile | 4 +- extra/busybox/config | 87 ++++++++++++++++++++++++++--------------- 4 files changed, 69 insertions(+), 40 deletions(-) (limited to 'extra') diff --git a/extra/busybox/.footprint.x86_64 b/extra/busybox/.footprint.x86_64 index 680d70b4a..1b8ec5d84 100644 --- a/extra/busybox/.footprint.x86_64 +++ b/extra/busybox/.footprint.x86_64 @@ -1,9 +1,7 @@ drwxr-xr-x root/root bin/ lrwxrwxrwx root/root bin/addgroup -> busybox lrwxrwxrwx root/root bin/adduser -> busybox -lrwxrwxrwx root/root bin/ash -> busybox lrwxrwxrwx root/root bin/base64 -> busybox -lrwxrwxrwx root/root bin/bash -> busybox -rwxr-xr-x root/root bin/busybox lrwxrwxrwx root/root bin/cat -> busybox lrwxrwxrwx root/root bin/catv -> busybox @@ -68,7 +66,7 @@ lrwxrwxrwx root/root bin/rm -> busybox lrwxrwxrwx root/root bin/rmdir -> busybox lrwxrwxrwx root/root bin/run-parts -> busybox lrwxrwxrwx root/root bin/setarch -> busybox -lrwxrwxrwx root/root bin/sh -> busybox +lrwxrwxrwx root/root bin/setserial -> busybox lrwxrwxrwx root/root bin/sleep -> busybox lrwxrwxrwx root/root bin/stat -> busybox lrwxrwxrwx root/root bin/stty -> busybox @@ -189,6 +187,7 @@ lrwxrwxrwx root/root usr/bin/free -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/ftpget -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/ftpput -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/fuser -> ../../bin/busybox +lrwxrwxrwx root/root usr/bin/groups -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/head -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/hexdump -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/hostid -> ../../bin/busybox @@ -200,7 +199,6 @@ lrwxrwxrwx root/root usr/bin/kbd_mode -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/killall -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/killall5 -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/last -> ../../bin/busybox -lrwxrwxrwx root/root usr/bin/length -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/less -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/logger -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/logname -> ../../bin/busybox @@ -226,6 +224,8 @@ lrwxrwxrwx root/root usr/bin/pkill -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/pmap -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/printf -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/pscan -> ../../bin/busybox +lrwxrwxrwx root/root usr/bin/pstree -> ../../bin/busybox +lrwxrwxrwx root/root usr/bin/pwdx -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/readahead -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/readlink -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/realpath -> ../../bin/busybox @@ -272,6 +272,7 @@ lrwxrwxrwx root/root usr/bin/unlzma -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/unxz -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/unzip -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/uptime -> ../../bin/busybox +lrwxrwxrwx root/root usr/bin/users -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/uudecode -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/uuencode -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/vlock -> ../../bin/busybox @@ -281,6 +282,7 @@ lrwxrwxrwx root/root usr/bin/wget -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/which -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/who -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/whoami -> ../../bin/busybox +lrwxrwxrwx root/root usr/bin/whois -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/xargs -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/xz -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/xzcat -> ../../bin/busybox @@ -305,3 +307,7 @@ lrwxrwxrwx root/root usr/sbin/readprofile -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/setfont -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/setlogcons -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/svlogd -> ../../bin/busybox +lrwxrwxrwx root/root usr/sbin/ubimkvol -> ../../bin/busybox +lrwxrwxrwx root/root usr/sbin/ubirmvol -> ../../bin/busybox +lrwxrwxrwx root/root usr/sbin/ubirsvol -> ../../bin/busybox +lrwxrwxrwx root/root usr/sbin/ubiupdatevol -> ../../bin/busybox diff --git a/extra/busybox/.md5sum.x86_64 b/extra/busybox/.md5sum.x86_64 index 7765d8045..1d283ef9a 100644 --- a/extra/busybox/.md5sum.x86_64 +++ b/extra/busybox/.md5sum.x86_64 @@ -1,2 +1,2 @@ -b03c5b46ced732679e525a920a1a62f5 busybox-1.18.4.tar.bz2 -aca25b59ba5324862c3a5e1752bccee0 config +50267054345f1a0b77fe65f6e0e5ba29 busybox-1.19.2.tar.bz2 +573ea6c8a46fe85936fa012c93d9d1ea config diff --git a/extra/busybox/Pkgfile b/extra/busybox/Pkgfile index e651d9112..980b1491d 100644 --- a/extra/busybox/Pkgfile +++ b/extra/busybox/Pkgfile @@ -4,7 +4,7 @@ # Packager: thierryn1 at hispeed dot ch name=busybox -version=1.18.4 +version=1.19.2 release=1 source=(http://busybox.net/downloads/$name-$version.tar.bz2 \ config) @@ -12,7 +12,7 @@ source=(http://busybox.net/downloads/$name-$version.tar.bz2 \ build() { cd $name-$version cp ../config .config - make menuconfig +# make menuconfig make cp .config `prt-get printf %p --filter=$name`/$name/config make CONFIG_PREFIX=$PKG install diff --git a/extra/busybox/config b/extra/busybox/config index b97603de6..fd547d2be 100644 --- a/extra/busybox/config +++ b/extra/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.4 -# Sun May 8 09:47:04 2011 +# Busybox version: 1.19.2 +# Mon Oct 31 15:27:14 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y @@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +CONFIG_FEATURE_SYSTEMD=y +CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SIZE_VS_SPEED=2 CONFIG_FEATURE_FAST_TOP=y @@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set @@ -106,6 +109,7 @@ CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y # CONFIG_MONOTONIC_SYSCALL is not set CONFIG_IOCTL_HEX2STR_ERROR=y CONFIG_FEATURE_HWIB=y @@ -169,12 +173,17 @@ CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y # CONFIG_FEATURE_DATE_NANO is not set CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_ID=y +CONFIG_GROUPS=y CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_BASE64=y +CONFIG_WHO=y +CONFIG_USERS=y CONFIG_CAL=y CONFIG_CATV=y CONFIG_CHGRP=y @@ -212,10 +221,8 @@ CONFIG_FOLD=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y -CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y @@ -267,7 +274,6 @@ CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TOUCH=y CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y @@ -279,7 +285,6 @@ CONFIG_UUDECODE=y CONFIG_UUENCODE=y CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y CONFIG_WHOAMI=y CONFIG_YES=y @@ -350,20 +355,13 @@ CONFIG_WHICH=y # Editors # CONFIG_PATCH=y -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_LONG_OPTIONS=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_ED=y -# CONFIG_SED is not set CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 # CONFIG_FEATURE_VI_8BIT is not set CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -372,6 +370,14 @@ CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_ED=y +# CONFIG_SED is not set CONFIG_FEATURE_ALLOW_EXEC=y # @@ -430,6 +436,7 @@ CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INITRD=y CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_MESG=y +CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y # # Login/Password Management Utilities @@ -515,6 +522,7 @@ CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y @@ -523,7 +531,7 @@ CONFIG_FEATURE_FBSET_READMODE=y CONFIG_FDFLUSH=y CONFIG_FDFORMAT=y CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set @@ -618,10 +626,25 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +CONFIG_SETSERIAL=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set +CONFIG_UBIMKVOL=y +CONFIG_UBIRMVOL=y +CONFIG_UBIRSVOL=y +CONFIG_UBIUPDATEVOL=y CONFIG_ADJTIMEX=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -662,15 +685,6 @@ CONFIG_INOTIFYD=y CONFIG_LAST=y CONFIG_FEATURE_LAST_SMALL=y # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set CONFIG_HDPARM=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y @@ -704,11 +718,17 @@ CONFIG_WATCHDOG=y # # Networking Utilities # +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NBDCLIENT=y CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_WHOIS=y CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y @@ -781,17 +801,12 @@ CONFIG_IPRULE=y CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_NTPD=y CONFIG_FEATURE_NTPD_SERVER=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y CONFIG_PSCAN=y CONFIG_ROUTE=y CONFIG_SLATTACH=y @@ -820,12 +835,14 @@ CONFIG_TRACEROUTE6=y # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="" CONFIG_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y CONFIG_FEATURE_UDHCP_PORT=y CONFIG_UDHCP_DEBUG=0 CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" @@ -861,15 +878,19 @@ CONFIG_FEATURE_MIME_CHARSET="" # CONFIG_IOSTAT=y CONFIG_MPSTAT=y +CONFIG_NMETER=y CONFIG_PMAP=y CONFIG_POWERTOP=y +CONFIG_PSTREE=y +CONFIG_PWDX=y CONFIG_SMEMCAP=y +CONFIG_UPTIME=y +CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_FREE=y CONFIG_FUSER=y CONFIG_KILL=y CONFIG_KILLALL=y CONFIG_KILLALL5=y -CONFIG_NMETER=y CONFIG_PGREP=y CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y @@ -890,7 +911,6 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set CONFIG_FEATURE_TOPMEM=y CONFIG_FEATURE_SHOW_THREADS=y -CONFIG_UPTIME=y CONFIG_WATCH=y # @@ -928,6 +948,7 @@ CONFIG_SOFTLIMIT=y # # CONFIG_ASH is not set # CONFIG_ASH_BASH_COMPAT is not set +# CONFIG_ASH_IDLE_TIMEOUT is not set # CONFIG_ASH_JOB_CONTROL is not set # CONFIG_ASH_ALIAS is not set # CONFIG_ASH_GETOPTS is not set @@ -968,6 +989,7 @@ CONFIG_FEATURE_BASH_IS_NONE=y # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set # # System Logging Utilities @@ -976,6 +998,7 @@ CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_CFG=y CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -- cgit v1.2.3-70-g09d2