diff options
-rw-r--r-- | base/busybox/.footprint | 12 | ||||
-rw-r--r-- | base/busybox/.md5sum | 4 | ||||
-rw-r--r-- | base/busybox/Pkgfile | 5 | ||||
-rw-r--r-- | base/busybox/config | 76 |
4 files changed, 65 insertions, 32 deletions
diff --git a/base/busybox/.footprint b/base/busybox/.footprint index 206c2748a..680d70b4a 100644 --- a/base/busybox/.footprint +++ b/base/busybox/.footprint @@ -2,6 +2,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 @@ -28,6 +29,7 @@ lrwxrwxrwx root/root bin/getopt -> busybox lrwxrwxrwx root/root bin/gunzip -> busybox lrwxrwxrwx root/root bin/gzip -> busybox lrwxrwxrwx root/root bin/hostname -> busybox +lrwxrwxrwx root/root bin/iostat -> busybox lrwxrwxrwx root/root bin/ip -> busybox lrwxrwxrwx root/root bin/ipaddr -> busybox lrwxrwxrwx root/root bin/ipcalc -> busybox @@ -48,6 +50,7 @@ lrwxrwxrwx root/root bin/mktemp -> busybox lrwxrwxrwx root/root bin/more -> busybox lrwxrwxrwx root/root bin/mount -> busybox lrwxrwxrwx root/root bin/mountpoint -> busybox +lrwxrwxrwx root/root bin/mpstat -> busybox lrwxrwxrwx root/root bin/mt -> busybox lrwxrwxrwx root/root bin/mv -> busybox lrwxrwxrwx root/root bin/netstat -> busybox @@ -56,6 +59,7 @@ lrwxrwxrwx root/root bin/pidof -> busybox lrwxrwxrwx root/root bin/ping -> busybox lrwxrwxrwx root/root bin/ping6 -> busybox lrwxrwxrwx root/root bin/pipe_progress -> busybox +lrwxrwxrwx root/root bin/powertop -> busybox lrwxrwxrwx root/root bin/printenv -> busybox lrwxrwxrwx root/root bin/ps -> busybox lrwxrwxrwx root/root bin/pwd -> busybox @@ -84,7 +88,9 @@ lrwxrwxrwx root/root linuxrc -> bin/busybox drwxr-xr-x root/root sbin/ lrwxrwxrwx root/root sbin/adjtimex -> ../bin/busybox lrwxrwxrwx root/root sbin/arp -> ../bin/busybox +lrwxrwxrwx root/root sbin/blockdev -> ../bin/busybox lrwxrwxrwx root/root sbin/bootchartd -> ../bin/busybox +lrwxrwxrwx root/root sbin/depmod -> ../bin/busybox lrwxrwxrwx root/root sbin/fbsplash -> ../bin/busybox lrwxrwxrwx root/root sbin/fdisk -> ../bin/busybox lrwxrwxrwx root/root sbin/findfs -> ../bin/busybox @@ -101,10 +107,12 @@ lrwxrwxrwx root/root sbin/ifenslave -> ../bin/busybox lrwxrwxrwx root/root sbin/ifup -> ../bin/busybox lrwxrwxrwx root/root sbin/init -> ../bin/busybox lrwxrwxrwx root/root sbin/inotifyd -> ../bin/busybox +lrwxrwxrwx root/root sbin/insmod -> ../bin/busybox lrwxrwxrwx root/root sbin/klogd -> ../bin/busybox lrwxrwxrwx root/root sbin/loadkmap -> ../bin/busybox lrwxrwxrwx root/root sbin/logread -> ../bin/busybox lrwxrwxrwx root/root sbin/losetup -> ../bin/busybox +lrwxrwxrwx root/root sbin/lsmod -> ../bin/busybox lrwxrwxrwx root/root sbin/makedevs -> ../bin/busybox lrwxrwxrwx root/root sbin/man -> ../bin/busybox lrwxrwxrwx root/root sbin/mdev -> ../bin/busybox @@ -115,11 +123,13 @@ lrwxrwxrwx root/root sbin/mkfs.minix -> ../bin/busybox lrwxrwxrwx root/root sbin/mkfs.vfat -> ../bin/busybox lrwxrwxrwx root/root sbin/mkswap -> ../bin/busybox lrwxrwxrwx root/root sbin/modinfo -> ../bin/busybox +lrwxrwxrwx root/root sbin/modprobe -> ../bin/busybox lrwxrwxrwx root/root sbin/nameif -> ../bin/busybox lrwxrwxrwx root/root sbin/pivot_root -> ../bin/busybox lrwxrwxrwx root/root sbin/poweroff -> ../bin/busybox lrwxrwxrwx root/root sbin/raidautorun -> ../bin/busybox lrwxrwxrwx root/root sbin/reboot -> ../bin/busybox +lrwxrwxrwx root/root sbin/rmmod -> ../bin/busybox lrwxrwxrwx root/root sbin/route -> ../bin/busybox lrwxrwxrwx root/root sbin/runlevel -> ../bin/busybox lrwxrwxrwx root/root sbin/setconsole -> ../bin/busybox @@ -213,6 +223,7 @@ lrwxrwxrwx root/root usr/bin/passwd -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/patch -> ../../bin/busybox lrwxrwxrwx root/root usr/bin/pgrep -> ../../bin/busybox 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/readahead -> ../../bin/busybox @@ -286,6 +297,7 @@ lrwxrwxrwx root/root usr/sbin/ftpd -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/httpd -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/inetd -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/loadfont -> ../../bin/busybox +lrwxrwxrwx root/root usr/sbin/nbd-client -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/ntpd -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/rdate -> ../../bin/busybox lrwxrwxrwx root/root usr/sbin/rdev -> ../../bin/busybox diff --git a/base/busybox/.md5sum b/base/busybox/.md5sum index af80c578d..2b4f5bec0 100644 --- a/base/busybox/.md5sum +++ b/base/busybox/.md5sum @@ -1,2 +1,2 @@ -a2ce1a951571da8c6e0eaf75b1acef60 busybox-1.17.3.tar.bz2 -4915377842a64a3a096a414ab1e485b4 config +f15fe752d8b7012aa5e59f83b88ccb1c busybox-1.18.1.tar.bz2 +2031ce087cfae25093317304d7789c0f config diff --git a/base/busybox/Pkgfile b/base/busybox/Pkgfile index fcfb51d07..0a68f9799 100644 --- a/base/busybox/Pkgfile +++ b/base/busybox/Pkgfile @@ -4,7 +4,7 @@ # Packager: thierryn1 at hispeed dot ch name=busybox -version=1.17.3 +version=1.18.1 release=1 source=(http://busybox.net/downloads/$name-$version.tar.bz2 \ config) @@ -12,8 +12,9 @@ source=(http://busybox.net/downloads/$name-$version.tar.bz2 \ build() { cd $name-$version cp ../config .config + make menuconfig make - cp .config $PKGMK_HOME_DIR/config + cp .config /tmp/config make CONFIG_PREFIX=$PKG install } diff --git a/base/busybox/config b/base/busybox/config index fe1625fd4..2632fae44 100644 --- a/base/busybox/config +++ b/base/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.17.3 -# Sat Oct 30 21:30:55 2010 +# Busybox version: 1.18.1 +# Sat Jan 1 17:55:30 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -16,6 +16,7 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_EXTRA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y # CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set @@ -23,6 +24,7 @@ CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_FEATURE_INSTALLER=y +# CONFIG_INSTALL_NO_USR is not set CONFIG_LOCALE_SUPPORT=y CONFIG_UNICODE_SUPPORT=y # CONFIG_UNICODE_USING_LOCALE is not set @@ -37,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_UTMP=y CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y @@ -73,9 +75,8 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_EFENCE is not set # -# Installation Options +# Installation Options ("make install" behavior) # -# CONFIG_INSTALL_NO_USR is not set CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_APPLET_HARDLINKS is not set # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set @@ -92,6 +93,7 @@ CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SIZE_VS_SPEED=2 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -172,6 +174,7 @@ CONFIG_FEATURE_TEST_64=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y CONFIG_CAL=y CONFIG_CATV=y CONFIG_CHGRP=y @@ -346,6 +349,7 @@ CONFIG_WHICH=y # # Editors # +CONFIG_PATCH=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set CONFIG_CMP=y @@ -353,7 +357,6 @@ CONFIG_DIFF=y CONFIG_FEATURE_DIFF_LONG_OPTIONS=y CONFIG_FEATURE_DIFF_DIR=y CONFIG_ED=y -CONFIG_PATCH=y # CONFIG_SED is not set CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 @@ -413,6 +416,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y CONFIG_BOOTCHARTD=y CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER=y CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_KILL_REMOVED is not set @@ -422,30 +428,30 @@ CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_FEATURE_INITRD=y -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" +CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_MESG=y # # Login/Password Management Utilities # +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set CONFIG_FEATURE_SHADOWPASSWDS=y CONFIG_USE_BB_PWD_GRP=y CONFIG_USE_BB_SHADOW=y CONFIG_USE_BB_CRYPT=y # CONFIG_USE_BB_CRYPT_SHA is not set -CONFIG_ADDGROUP=y -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -# CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +# CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_FIRST_SYSTEM_ID=1000 CONFIG_LAST_SYSTEM_ID=9999 +CONFIG_ADDGROUP=y +# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set +CONFIG_FEATURE_ADDUSER_TO_GROUP=y CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y CONFIG_GETTY=y CONFIG_LOGIN=y # CONFIG_PAM is not set @@ -477,13 +483,13 @@ CONFIG_MODINFO=y # 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 -# CONFIG_INSMOD is not set -# CONFIG_RMMOD is not set -# CONFIG_LSMOD is not set +CONFIG_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set +CONFIG_MODPROBE=y # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set +CONFIG_DEPMOD=y # # Options common to multiple modutils @@ -495,15 +501,16 @@ CONFIG_MODINFO=y # 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_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y CONFIG_DEFAULT_MODULES_DIR="/lib/modules" CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # +CONFIG_BLOCKDEV=y CONFIG_REV=y # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set @@ -522,6 +529,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_GPT_LABEL is not set CONFIG_FEATURE_FDISK_ADVANCED=y CONFIG_FINDFS=y CONFIG_FLOCK=y @@ -554,7 +562,6 @@ CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y CONFIG_MOUNT=y CONFIG_FEATURE_MOUNT_FAKE=y CONFIG_FEATURE_MOUNT_VERBOSE=y @@ -611,10 +618,13 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set CONFIG_ADJTIMEX=y # CONFIG_BBCONFIG is not set +# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -694,6 +704,7 @@ CONFIG_WATCHDOG=y # # Networking Utilities # +CONFIG_NBDCLIENT=y CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y @@ -729,6 +740,7 @@ CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y CONFIG_FEATURE_HTTPD_ERROR_PAGES=y CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_FEATURE_HTTPD_GZIP=y CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -823,6 +835,7 @@ CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_ZCIP=y # @@ -846,6 +859,10 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y CONFIG_SMEMCAP=y CONFIG_FREE=y CONFIG_FUSER=y @@ -922,10 +939,13 @@ CONFIG_ASH_CMDCMD=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_RANDOM_SUPPORT=y CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set # CONFIG_HUSH_TICK is not set # CONFIG_HUSH_IF is not set @@ -933,22 +953,21 @@ CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH_CASE is not set # CONFIG_HUSH_FUNCTIONS is not set # CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_MODE_X is not set +# CONFIG_MSH 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 CONFIG_SH_MATH_SUPPORT_64=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_CTTYHACK is not set # # System Logging Utilities @@ -963,4 +982,5 @@ CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_KLOGD=y +CONFIG_FEATURE_KLOGD_KLOGCTL=y CONFIG_LOGGER=y |