From d2b72381c2018862c4be24e37334d0001e54d37c Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 26 Oct 2010 10:41:51 +0000 Subject: [PATCH] sys-kernel/genkernel: Bump busybox git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2589 6952d904-891a-0410-993b-d76249ca496b --- sys-kernel/genkernel/ChangeLog | 6 + sys-kernel/genkernel/Manifest | 11 +- .../genkernel-3.4.10.907-busybox-1.17.3.patch | 1250 +++++++++++++++++ .../genkernel-3.4.10.907-nice-option.patch | 215 --- .../genkernel/genkernel-3.4.10.907-r13.ebuild | 12 +- 5 files changed, 1265 insertions(+), 229 deletions(-) create mode 100644 sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch delete mode 100644 sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-nice-option.patch diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog index 1d20a6d..70de9b1 100644 --- a/sys-kernel/genkernel/ChangeLog +++ b/sys-kernel/genkernel/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Oct 2010; Mario Fetka + genkernel-3.4.10.907-r13.ebuild, + +files/3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch, + -files/3.4.11/genkernel-3.4.10.907-nice-option.patch: + Bump busybox + 25 Oct 2010; Mario Fetka -genkernel-3.4.10.907-r3.ebuild, +genkernel-3.4.10.907-r13.ebuild, +files/3.4.11/genkernel-3.4.10.907-nice-option.patch, diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index 138cdd9..20ee9a2 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -1,5 +1,5 @@ AUX 3.4.11/0001-use-mdadm-instead-of-bundled-stripped-down-mdassembl.patch 5450 RMD160 03c674f453a3256181db93346856ae05fec3c52c SHA1 acf12ec07e152bd367c511a2d01747b6d2bb0f00 SHA256 3b32865584756e053be14358286de9246621e14b6c135e2fc03e2d99279bb7be -AUX 3.4.11/genkernel-3.4.10.907-nice-option.patch 7439 RMD160 c1c767aafad796fc7ce72cbf752ef046af509914 SHA1 3d439d59bcd1b938bd3033ccde4766f1e3738df0 SHA256 fc39b41c58be3853267c7a3186a973ed9bc0a2b1671e36d5716ef5513fbe9afe +AUX 3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch 38833 RMD160 5dda7e0d16a0c6d238f0bb8622c96816f7751d81 SHA1 d21aa64341c53d59381bfb442260c8195e6f32ca SHA256 dd947c6fa94274a30723b1a085431e4e01adff30b1616aa2766ae4a5f07ddca5 AUX 3.4.11/genkernel-3.4.11-aufs-slowusb.patch 3425 RMD160 74add9c16143240da14ad307a25d5cccba58e893 SHA1 ffeee71f9e2146e0533591e62c0b3d1e0f77efd7 SHA256 8a131caf94253c0799daa18e0146b13b96f0667552ad6f97ce246c13f403a900 AUX 3.4.11/genkernel-3.4.11-branding.patch 3273 RMD160 8234e9da1ee6e4f89074b3a97a8508db07a6be01 SHA1 f7fa1b8b07aa334b54e96a510756d6f82954ed90 SHA256 d9a9907c5bd316ee7384f4dcb3f2d80775b5aed1fb6b40763bce8543ecee86a2 AUX 3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch 291 RMD160 06cea814b7f1a44bda3a46bb5939ebc5649be485 SHA1 eb65b70222e3063379d71d3e2091ffb8b6b2cbc6 SHA256 c4f83688c1bec65bd7082d93be0e014163c9ecf0c9f5a0d36ec1ed5645bfca2b @@ -10,13 +10,12 @@ AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15 DIST LVM2.2.02.75.tgz 956607 RMD160 0ad7cb0b298bdff744c7a751e23ea6e78a96ade7 SHA1 d16d6bf2b75ae6164fbaa111c75529402664f524 SHA256 f63ad083f9e371b4b490e8eaa9645447d456a76ae6a099e0b910e2e1ada75ba4 DIST busybox-1.17.3.tar.bz2 2094550 RMD160 1abd376ca05da9fb25c1d51207f5be7e291fdd71 SHA1 9c4090b010441cd1f0800830583e1e7612ba19fb SHA256 de2f0274f61a068d75ad33861e0982e99c6b625681460ce420222371c3511ff2 DIST device-mapper.1.02.28.tgz 203182 RMD160 07919b9ddcb707d0c199f64f92718b4e8c88198a SHA1 0d1b4e27b5afa5f68b8bc6e1905f9430470045b7 SHA256 24c7887fe896325a6cdc86b8beeb0d9c2de8b1c4cb20f53c2dc8f90963fc39bf -DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec -DIST e2fsprogs-1.41.12.tar.gz 4496194 RMD160 aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7 SHA1 62b002fe507b2ddafc24b89532e472fe4b55a14f SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20 -DIST fuse-2.8.5.tar.gz 503349 RMD160 0b3fee4f2ee84a3d8fad9e0d5bf09383800293bc SHA1 862320b56d6bc4ad5e7be2b1e0b5029166aae09b SHA256 bec80e66ae8ee60dfdf67b2ca291266a45dcfe6bc20c64f3acfceaa38ed29a84 +DIST dmraid-1.0.0.rc16.tar.bz2 1042907 RMD160 b5fe992f4bc2e1a0716fc0c9e689b214667982d1 SHA1 99e76332bb03c5a79406e3c8cb12b6746288635d SHA256 f849c44d041f8891c61419ddf906e6e34b44948939ae9e550be662ffc2492255 +DIST fuse-2.7.4.tar.gz 506658 RMD160 fe1808cfd58ad6651259245b424301e99881faa2 SHA1 7a86f5cf39f38e64ccbae093599d64a895b950ba SHA256 c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6 DIST genkernel-3.4.10.907.tar.bz2 202413 RMD160 81ea32bb0b91ed7114bd825b7339132214abc2df SHA1 f2f2ab0658283e3a17caaa3fcc93ddf619e04afa SHA256 0fe4bd273d3ab9fe87e12fbf65b41edafc05cce95e0412e3f5450a0ca6010f12 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63 DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb DIST unionfs-fuse-0.24.tar.bz2 30381 RMD160 27934c23472f6e9d71e622f13aa9fd51a1f8018e SHA1 26f281e4e5f1e82194b430956b94cd7745d5bd97 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937 -EBUILD genkernel-3.4.10.907-r13.ebuild 5188 RMD160 52d51eb261a8bd09fe08a47e95bcf11a34ba24a0 SHA1 0a79436860416d970cb51318163f07a167ecf671 SHA256 58576b4cb3772d35ddb7b43d7d68200e3c26b28e4bc907990cb5663e1f83c6e8 -MISC ChangeLog 409 RMD160 7eaa8efac7007707fe9332bc3e8aaa8f7c7c28d0 SHA1 3411122f3e9cd3b35a773070513a71903e330271 SHA256 004594ce1d78ff498707aea18d46a935dc2625ca0f0c789ef4306bedb0916b85 +EBUILD genkernel-3.4.10.907-r13.ebuild 4985 RMD160 c71693f7278755eaaa4cb71a4690f2d1ac13f682 SHA1 6b5f9c869199026c367d226e9b5591f25ec25644 SHA256 bfcfe57f44b7be8963bddbc4d047798bec17b4ec291787f058ec1bcc13290eb8 +MISC ChangeLog 626 RMD160 113dd049b84c9e1dc298f347477f3e176804c017 SHA1 7384e61766eac99af25fc9fca073f96a6a00c62f SHA256 ddd6186cd4e4f770ca9b0db13e0b1f105c6fad7d4f7b5ccf6e1f576b9f0ad2b4 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch new file mode 100644 index 0000000..e78fabb --- /dev/null +++ b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch @@ -0,0 +1,1250 @@ +Submitted By: Mario Fetka (mario dot fetka at gmail dot com) +Date: 2010-10-26 +Initial Package Version: 3.4.10.907 +Origin: me +Upstream Status: unknown +Description: bump busybox and remove use of e2fsprogs + +diff -Naur genkernel-3.4.10.907.orig/defaults/busy-config genkernel-3.4.10.907/defaults/busy-config +--- genkernel-3.4.10.907.orig/defaults/busy-config 2009-12-17 04:21:37.000000000 +0000 ++++ genkernel-3.4.10.907/defaults/busy-config 2010-10-26 06:54:05.000000000 +0000 +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit +-# Busybox version: 1.7.4 +-# Tue Mar 11 13:29:47 2008 ++# Busybox version: 1.17.3 ++# Tue Oct 26 08:54:05 2010 + # + CONFIG_HAVE_DOT_CONFIG=y + +@@ -12,9 +12,11 @@ + # + # General Configuration + # +-# CONFIG_NITPICK is not set + # CONFIG_DESKTOP is not set +-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set ++# CONFIG_EXTRA_COMPAT is not set ++# CONFIG_INCLUDE_SUSv2 is not set ++# CONFIG_USE_PORTABLE_CODE is not set ++CONFIG_FEATURE_BUFFERS_USE_MALLOC=y + # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set + # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set + CONFIG_SHOW_USAGE=y +@@ -22,13 +24,25 @@ + CONFIG_FEATURE_COMPRESS_USAGE=y + CONFIG_FEATURE_INSTALLER=y + # CONFIG_LOCALE_SUPPORT is not set +-CONFIG_GETOPT_LONG=y ++# CONFIG_UNICODE_SUPPORT is not set ++# CONFIG_UNICODE_USING_LOCALE is not set ++# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set ++CONFIG_SUBST_WCHAR=0 ++CONFIG_LAST_SUPPORTED_WCHAR=0 ++# 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 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 +-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set ++CONFIG_FEATURE_SUID=y ++CONFIG_FEATURE_SUID_CONFIG=y ++CONFIG_FEATURE_SUID_CONFIG_QUIET=y + # CONFIG_SELINUX is not set + CONFIG_FEATURE_PREFER_APPLETS=y + CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +@@ -39,21 +53,24 @@ + # Build Options + # + CONFIG_STATIC=y ++# CONFIG_PIE is not set ++# CONFIG_NOMMU is not set + # CONFIG_BUILD_LIBBUSYBOX is not set +-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set ++# CONFIG_FEATURE_INDIVIDUAL is not set + # CONFIG_FEATURE_SHARED_BUSYBOX is not set + CONFIG_LFS=y +-# CONFIG_BUILD_AT_ONCE is not set ++CONFIG_CROSS_COMPILER_PREFIX="" ++CONFIG_EXTRA_CFLAGS="" + + # + # Debugging Options + # + # CONFIG_DEBUG is not set ++# CONFIG_DEBUG_PESSIMIZE is not set + # CONFIG_WERROR is not set + CONFIG_NO_DEBUG_LIB=y + # CONFIG_DMALLOC is not set + # CONFIG_EFENCE is not set +-# CONFIG_INCLUDE_SUSv2 is not set + + # + # Installation Options +@@ -61,7 +78,11 @@ + # 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 + # CONFIG_INSTALL_APPLET_DONT is not set ++# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set ++# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set ++# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set + CONFIG_PREFIX="./_install" + + # +@@ -73,15 +94,19 @@ + # CONFIG_FEATURE_ETC_NETWORKS is not set + CONFIG_FEATURE_EDITING=y + CONFIG_FEATURE_EDITING_MAX_LEN=1024 +-# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set + # CONFIG_FEATURE_EDITING_VI is not set + CONFIG_FEATURE_EDITING_HISTORY=15 + # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set + CONFIG_FEATURE_TAB_COMPLETION=y + # CONFIG_FEATURE_USERNAME_COMPLETION is not set + # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set ++# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set ++CONFIG_FEATURE_NON_POSIX_CP=y ++CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y ++CONFIG_FEATURE_COPYBUF_KB=4 + CONFIG_MONOTONIC_SYSCALL=y + CONFIG_IOCTL_HEX2STR_ERROR=y ++CONFIG_FEATURE_HWIB=y + + # + # Applets +@@ -90,64 +115,81 @@ + # + # 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=y + # CONFIG_AR is not set + # CONFIG_FEATURE_AR_LONG_FILENAMES is not set +-# CONFIG_BUNZIP2 is not set +-# CONFIG_CPIO is not set ++# CONFIG_FEATURE_AR_CREATE is not set ++CONFIG_BUNZIP2=y ++CONFIG_BZIP2=y ++CONFIG_CPIO=y ++CONFIG_FEATURE_CPIO_O=y ++CONFIG_FEATURE_CPIO_P=y + # 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 ++CONFIG_FEATURE_GZIP_LONG_OPTIONS=y ++CONFIG_LZOP=y ++# CONFIG_LZOP_COMPR_HIGH is not set + # CONFIG_RPM2CPIO is not set + # CONFIG_RPM is not set +-# CONFIG_FEATURE_RPM_BZ2 is not set + CONFIG_TAR=y + CONFIG_FEATURE_TAR_CREATE=y +-CONFIG_FEATURE_TAR_BZIP2=y +-# CONFIG_FEATURE_TAR_LZMA is not set ++CONFIG_FEATURE_TAR_AUTODETECT=y + # CONFIG_FEATURE_TAR_FROM is not set +-CONFIG_FEATURE_TAR_GZIP=y +-# CONFIG_FEATURE_TAR_COMPRESS is not set + # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set + # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set + CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y + # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set ++# CONFIG_FEATURE_TAR_TO_COMMAND is not set ++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_UNZIP is not set +- +-# +-# 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 ++CONFIG_UNLZMA=y ++CONFIG_FEATURE_LZMA_FAST=y ++CONFIG_LZMA=y ++CONFIG_UNXZ=y ++CONFIG_XZ=y ++CONFIG_UNZIP=y + + # + # Coreutils + # + CONFIG_BASENAME=y +-# 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 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=y + CONFIG_CHMOD=y + CONFIG_CHOWN=y ++CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y + CONFIG_CHROOT=y + # CONFIG_CKSUM is not set + # CONFIG_COMM is not set + CONFIG_CP=y ++CONFIG_FEATURE_CP_LONG_OPTIONS=y + CONFIG_CUT=y +-CONFIG_DATE=y +-CONFIG_FEATURE_DATE_ISOFMT=y + CONFIG_DD=y + CONFIG_FEATURE_DD_SIGNAL_HANDLING=y ++CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y + # CONFIG_FEATURE_DD_IBS_OBS is not set + CONFIG_DF=y ++CONFIG_FEATURE_DF_FANCY=y + CONFIG_DIRNAME=y + # CONFIG_DOS2UNIX is not set + # CONFIG_UNIX2DOS is not set +@@ -163,6 +205,7 @@ + # CONFIG_EXPR_MATH_SUPPORT_64 is not set + CONFIG_FALSE=y + # CONFIG_FOLD is not set ++CONFIG_FSYNC=y + CONFIG_HEAD=y + # CONFIG_FEATURE_FANCY_HEAD is not set + # CONFIG_HOSTID is not set +@@ -188,8 +231,8 @@ + 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_NICE=y ++CONFIG_NOHUP=y + # CONFIG_OD is not set + # CONFIG_PRINTENV is not set + # CONFIG_PRINTF is not set +@@ -199,10 +242,14 @@ + # CONFIG_REALPATH is not set + CONFIG_RM=y + CONFIG_RMDIR=y ++CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y + # CONFIG_SEQ is not set + # CONFIG_SHA1SUM is not set ++# CONFIG_SHA256SUM is not set ++# CONFIG_SHA512SUM is not set + CONFIG_SLEEP=y + # CONFIG_FEATURE_FANCY_SLEEP is not set ++# CONFIG_FEATURE_FLOAT_SLEEP is not set + CONFIG_SORT=y + CONFIG_FEATURE_SORT_BIG=y + # CONFIG_SPLIT is not set +@@ -212,16 +259,12 @@ + CONFIG_STTY=y + # CONFIG_SUM is not set + CONFIG_SYNC=y ++# CONFIG_TAC is not set + CONFIG_TAIL=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 is not set + 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 +@@ -257,9 +300,11 @@ + # Console Utilities + # + CONFIG_CHVT=y ++# CONFIG_FGCONSOLE is not set + CONFIG_CLEAR=y + # CONFIG_DEALLOCVT is not set + CONFIG_DUMPKMAP=y ++# CONFIG_KBD_MODE is not set + CONFIG_LOADFONT=y + CONFIG_LOADKMAP=y + # CONFIG_OPENVT is not set +@@ -268,8 +313,18 @@ + # CONFIG_FEATURE_RESIZE_PRINT is not set + # CONFIG_SETCONSOLE is not set + # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set ++# CONFIG_SETFONT is not set ++# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set ++CONFIG_DEFAULT_SETFONT_DIR="" + # CONFIG_SETKEYCODES is not set + # CONFIG_SETLOGCONS is not set ++# CONFIG_SHOWKEY is not set ++ ++# ++# Common options for loadfont and setfont ++# ++CONFIG_FEATURE_LOADFONT_PSF2=y ++CONFIG_FEATURE_LOADFONT_RAW=y + + # + # Debian Utilities +@@ -288,17 +343,17 @@ + # Editors + # + # CONFIG_AWK is not set +-# CONFIG_FEATURE_AWK_MATH is not set ++# CONFIG_FEATURE_AWK_LIBM is not set + # CONFIG_CMP is not set + # CONFIG_DIFF is not set +-# CONFIG_FEATURE_DIFF_BINARY is not set ++# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set + # CONFIG_FEATURE_DIFF_DIR is not set +-# CONFIG_FEATURE_DIFF_MINIMAL is not set + # CONFIG_ED is not set + # CONFIG_PATCH is not set + CONFIG_SED=y + # CONFIG_VI is not set +-CONFIG_FEATURE_VI_MAX_LEN= ++CONFIG_FEATURE_VI_MAX_LEN=0 ++# CONFIG_FEATURE_VI_8BIT is not set + # CONFIG_FEATURE_VI_COLON is not set + # CONFIG_FEATURE_VI_YANKMARK is not set + # CONFIG_FEATURE_VI_SEARCH is not set +@@ -308,6 +363,7 @@ + # 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 + +@@ -316,9 +372,9 @@ + # + CONFIG_FIND=y + CONFIG_FEATURE_FIND_PRINT0=y +-# CONFIG_FEATURE_FIND_MTIME is not set ++CONFIG_FEATURE_FIND_MTIME=y + CONFIG_FEATURE_FIND_MMIN=y +-# CONFIG_FEATURE_FIND_PERM is not set ++CONFIG_FEATURE_FIND_PERM=y + CONFIG_FEATURE_FIND_TYPE=y + CONFIG_FEATURE_FIND_XDEV=y + CONFIG_FEATURE_FIND_MAXDEPTH=y +@@ -331,13 +387,14 @@ + CONFIG_FEATURE_FIND_DEPTH=y + CONFIG_FEATURE_FIND_PAREN=y + CONFIG_FEATURE_FIND_SIZE=y +-# CONFIG_FEATURE_FIND_PRUNE is not set +-# CONFIG_FEATURE_FIND_DELETE is not set +-# CONFIG_FEATURE_FIND_PATH is not set +-# CONFIG_FEATURE_FIND_REGEX is not set ++CONFIG_FEATURE_FIND_PRUNE=y ++CONFIG_FEATURE_FIND_DELETE=y ++CONFIG_FEATURE_FIND_PATH=y ++CONFIG_FEATURE_FIND_REGEX=y + # CONFIG_FEATURE_FIND_CONTEXT is not set ++CONFIG_FEATURE_FIND_LINKS=y + CONFIG_GREP=y +-# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set ++CONFIG_FEATURE_GREP_EGREP_ALIAS=y + CONFIG_FEATURE_GREP_FGREP_ALIAS=y + # CONFIG_FEATURE_GREP_CONTEXT is not set + CONFIG_XARGS=y +@@ -349,39 +406,50 @@ + # + # 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=y +-# CONFIG_DEBUG_INIT is not set + CONFIG_FEATURE_USE_INITTAB=y ++# CONFIG_FEATURE_KILL_REMOVED is not set ++CONFIG_FEATURE_KILL_DELAY=0 + # CONFIG_FEATURE_INIT_SCTTY is not set + # CONFIG_FEATURE_INIT_SYSLOG is not set + # CONFIG_FEATURE_EXTRA_QUIET is not set + # CONFIG_FEATURE_INIT_COREDUMPS is not set + CONFIG_FEATURE_INITRD=y + CONFIG_HALT=y ++# CONFIG_FEATURE_CALL_TELINIT is not set ++CONFIG_TELINIT_PATH="" + CONFIG_MESG=y + + # + # Login/Password Management Utilities + # + # CONFIG_FEATURE_SHADOWPASSWDS is not set +-# CONFIG_USE_BB_SHADOW is not set + # CONFIG_USE_BB_PWD_GRP is not set ++# CONFIG_USE_BB_SHADOW is not set ++CONFIG_USE_BB_CRYPT=y ++CONFIG_USE_BB_CRYPT_SHA=y + # CONFIG_ADDGROUP is not set ++# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set + # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set + # CONFIG_DELGROUP is not set + # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set ++# CONFIG_FEATURE_CHECK_NAMES is not set + # CONFIG_ADDUSER is not set ++# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set ++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 + # CONFIG_FEATURE_NOLOGIN is not set + # CONFIG_FEATURE_SECURETTY is not set +-# CONFIG_PASSWD is not set +-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set ++CONFIG_PASSWD=y ++CONFIG_FEATURE_PASSWD_WEAK_CHECK=y + # CONFIG_CRYPTPW is not set + CONFIG_CHPASSWD=y + # CONFIG_SU is not set +@@ -393,37 +461,49 @@ + # + # Linux Ext2 FS Progs + # +-# CONFIG_CHATTR is not set +-# CONFIG_FSCK is not set +-# CONFIG_LSATTR is not set ++CONFIG_CHATTR=y ++CONFIG_FSCK=y ++CONFIG_LSATTR=y ++CONFIG_TUNE2FS=y + + # + # Linux Module Utilities + # ++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=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 is not set ++CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y + CONFIG_MODPROBE=y +-CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y +-CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y ++CONFIG_FEATURE_MODPROBE_BLACKLIST=y ++CONFIG_DEPMOD=y + + # + # Options common to multiple modutils + # ++# CONFIG_FEATURE_2_4_MODULES is not set ++CONFIG_FEATURE_INSMOD_TRY_MMAP=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_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 ++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_REV=y ++CONFIG_ACPID=y ++CONFIG_FEATURE_ACPID_COMPAT=y ++CONFIG_BLKID=y + CONFIG_DMESG=y + CONFIG_FEATURE_DMESG_PRETTY=y + # CONFIG_FBSET is not set +@@ -439,38 +519,57 @@ + # CONFIG_FEATURE_SUN_LABEL is not set + # CONFIG_FEATURE_OSF_LABEL is not set + # CONFIG_FEATURE_FDISK_ADVANCED is not set ++CONFIG_FINDFS=y ++CONFIG_FLOCK=y + CONFIG_FREERAMDISK=y + # CONFIG_FSCK_MINIX is not set ++CONFIG_MKFS_EXT2=y + # CONFIG_MKFS_MINIX is not set + # CONFIG_FEATURE_MINIX2 is not set ++CONFIG_MKFS_REISER=y ++CONFIG_MKFS_VFAT=y + # CONFIG_GETOPT is not set ++# CONFIG_FEATURE_GETOPT_LONG is not set + CONFIG_HEXDUMP=y +-# CONFIG_HWCLOCK is not set +-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set ++CONFIG_FEATURE_HEXDUMP_REVERSE=y ++CONFIG_HD=y ++CONFIG_HWCLOCK=y ++CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y ++CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y + # CONFIG_IPCRM is not set + # CONFIG_IPCS is not set + CONFIG_LOSETUP=y +-CONFIG_MDADM=y ++CONFIG_LSPCI=y ++CONFIG_LSUSB=y + CONFIG_MDEV=y + # CONFIG_FEATURE_MDEV_CONF is not set ++# CONFIG_FEATURE_MDEV_RENAME is not set ++# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set + # CONFIG_FEATURE_MDEV_EXEC is not set + CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +-CONFIG_MDSTART=y +-# CONFIG_MKSWAP is not set +-# CONFIG_FEATURE_MKSWAP_V0 is not set ++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 ++# CONFIG_FEATURE_MOUNT_HELPERS is not set ++CONFIG_FEATURE_MOUNT_LABEL=y + CONFIG_FEATURE_MOUNT_NFS=y + # CONFIG_FEATURE_MOUNT_CIFS is not set + CONFIG_FEATURE_MOUNT_FLAGS=y + CONFIG_FEATURE_MOUNT_FSTAB=y + CONFIG_PIVOT_ROOT=y + CONFIG_RDATE=y ++CONFIG_RDEV=y + # CONFIG_READPROFILE is not set ++CONFIG_RTCWAKE=y ++CONFIG_SCRIPT=y ++CONFIG_SCRIPTREPLAY=y + # CONFIG_SETARCH is not set + CONFIG_SWAPONOFF=y ++CONFIG_FEATURE_SWAPON_PRI=y + CONFIG_SWITCH_ROOT=y + CONFIG_UMOUNT=y + # CONFIG_FEATURE_UMOUNT_ALL is not set +@@ -479,33 +578,85 @@ + # Common options for mount/umount + # + CONFIG_FEATURE_MOUNT_LOOP=y ++CONFIG_FEATURE_MOUNT_LOOP_CREATE=y + CONFIG_FEATURE_MTAB_SUPPORT=y ++CONFIG_VOLUMEID=y ++ ++# ++# Filesystem/Volume identification ++# ++CONFIG_FEATURE_VOLUMEID_EXT=y ++CONFIG_FEATURE_VOLUMEID_BTRFS=y ++CONFIG_FEATURE_VOLUMEID_REISERFS=y ++CONFIG_FEATURE_VOLUMEID_FAT=y ++CONFIG_FEATURE_VOLUMEID_HFS=y ++CONFIG_FEATURE_VOLUMEID_JFS=y ++CONFIG_FEATURE_VOLUMEID_XFS=y ++CONFIG_FEATURE_VOLUMEID_NTFS=y ++CONFIG_FEATURE_VOLUMEID_ISO9660=y ++CONFIG_FEATURE_VOLUMEID_UDF=y ++CONFIG_FEATURE_VOLUMEID_LUKS=y ++CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y ++CONFIG_FEATURE_VOLUMEID_CRAMFS=y ++CONFIG_FEATURE_VOLUMEID_ROMFS=y ++CONFIG_FEATURE_VOLUMEID_SYSV=y ++CONFIG_FEATURE_VOLUMEID_OCFS2=y ++CONFIG_FEATURE_VOLUMEID_LINUXRAID=y + + # + # 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 ++CONFIG_FEATURE_BEEP_FREQ=0 ++CONFIG_FEATURE_BEEP_LENGTH_MS=0 ++# CONFIG_CHAT is not set ++# CONFIG_FEATURE_CHAT_NOFAIL is not set ++# CONFIG_FEATURE_CHAT_TTY_HIFI is not set ++# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set ++# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set ++# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set ++# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set ++# CONFIG_FEATURE_CHAT_CLR_ABORT is not set + # CONFIG_CHRT is not set + # CONFIG_CROND is not set +-# CONFIG_DEBUG_CROND_OPTION is not set ++# CONFIG_FEATURE_CROND_D is not set + # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set ++CONFIG_FEATURE_CROND_DIR="" + # CONFIG_CRONTAB is not set + # CONFIG_DC is not set ++# CONFIG_FEATURE_DC_LIBM is not set + # 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_DEVMEM is not set + # CONFIG_EJECT is not set ++# CONFIG_FEATURE_EJECT_SCSI is not set ++# CONFIG_FBSPLASH is not set ++# CONFIG_FLASHCP is not set ++# CONFIG_FLASH_LOCK is not set ++# CONFIG_FLASH_UNLOCK is not set ++# CONFIG_FLASH_ERASEALL is not set ++CONFIG_IONICE=y ++# CONFIG_INOTIFYD is not set + # CONFIG_LAST is not set ++# CONFIG_FEATURE_LAST_SMALL is not set ++# CONFIG_FEATURE_LAST_FANCY is not set + # CONFIG_LESS is not set +-CONFIG_FEATURE_LESS_MAXLINES= ++CONFIG_FEATURE_LESS_MAXLINES=0 + # 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 is not set ++# CONFIG_FEATURE_LESS_WINCH is not set ++# CONFIG_FEATURE_LESS_DASHCMD is not set ++# CONFIG_FEATURE_LESS_LINENUMS is not set + # CONFIG_HDPARM is not set + # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set + # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +@@ -516,54 +667,74 @@ + CONFIG_MAKEDEVS=y + CONFIG_FEATURE_MAKEDEVS_LEAF=y + # CONFIG_FEATURE_MAKEDEVS_TABLE is not set ++# CONFIG_MAN is not set ++# CONFIG_MICROCOM is not set + # CONFIG_MOUNTPOINT is not set + # CONFIG_MT is not set +-# CONFIG_RAIDAUTORUN is not set ++CONFIG_RAIDAUTORUN=y + # CONFIG_READAHEAD is not set ++# CONFIG_RFKILL is not set + # CONFIG_RUNLEVEL is not set + # CONFIG_RX is not set +-# CONFIG_STRINGS is not set + # CONFIG_SETSID is not set ++# CONFIG_STRINGS is not set + # CONFIG_TASKSET is not set + # CONFIG_FEATURE_TASKSET_FANCY is not set + # CONFIG_TIME is not set ++# CONFIG_TIMEOUT is not set + # CONFIG_TTYSIZE is not set ++CONFIG_VOLNAME=y ++# CONFIG_WALL is not set + # CONFIG_WATCHDOG is not set + + # + # Networking Utilities + # +-# CONFIG_FEATURE_IPV6 is not set ++# 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=y ++# CONFIG_FEATURE_UNIX_LOCAL is not set ++CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y + # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +-# CONFIG_ARP is not set ++CONFIG_ARP=y + # CONFIG_ARPING is not set ++# CONFIG_BRCTL is not set ++# CONFIG_FEATURE_BRCTL_FANCY is not set ++# CONFIG_FEATURE_BRCTL_SHOW is not set + # CONFIG_DNSD is not set +-# CONFIG_ETHER_WAKE is not set ++CONFIG_ETHER_WAKE=y + # CONFIG_FAKEIDENTD is not set +-# CONFIG_FTPGET is not set +-# CONFIG_FTPPUT is not set +-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set ++CONFIG_FTPD=y ++CONFIG_FEATURE_FTP_WRITE=y ++CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y ++CONFIG_FTPGET=y ++CONFIG_FTPPUT=y ++CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y + CONFIG_HOSTNAME=y + # CONFIG_HTTPD is not set ++# CONFIG_FEATURE_HTTPD_RANGES is not set + # CONFIG_FEATURE_HTTPD_USE_SENDFILE 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_FEATURE_HTTPD_ERROR_PAGES is not set ++# CONFIG_FEATURE_HTTPD_PROXY is not set + CONFIG_IFCONFIG=y + CONFIG_FEATURE_IFCONFIG_STATUS=y + # CONFIG_FEATURE_IFCONFIG_SLIP is not set + # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set + CONFIG_FEATURE_IFCONFIG_HW=y + # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set ++# CONFIG_IFENSLAVE is not set ++# CONFIG_IFPLUGD is not set + # CONFIG_IFUPDOWN is not set +-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" ++CONFIG_IFUPDOWN_IFSTATE_PATH="" + # CONFIG_FEATURE_IFUPDOWN_IP is not set + # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set + # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +@@ -585,6 +756,7 @@ + # CONFIG_FEATURE_IP_TUNNEL is not set + # CONFIG_FEATURE_IP_RULE is not set + # CONFIG_FEATURE_IP_SHORT_FORMS is not set ++# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set + # CONFIG_IPADDR is not set + # CONFIG_IPLINK is not set + # CONFIG_IPROUTE is not set +@@ -594,90 +766,152 @@ + # 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_SERVER is not set +-# CONFIG_NC_EXTRA is not set ++# CONFIG_FEATURE_NAMEIF_EXTENDED is not set + # CONFIG_NETSTAT is not set + # CONFIG_FEATURE_NETSTAT_WIDE is not set ++# CONFIG_FEATURE_NETSTAT_PRG is not set + # CONFIG_NSLOOKUP is not set ++CONFIG_NTPD=y ++# CONFIG_FEATURE_NTPD_SERVER is not set + CONFIG_PING=y +-# CONFIG_PING6 is not set +-# CONFIG_PSCAN is not set ++CONFIG_PING6=y + CONFIG_FEATURE_FANCY_PING=y ++# CONFIG_PSCAN is not set + CONFIG_ROUTE=y + # CONFIG_SLATTACH is not set +-# CONFIG_TELNET is not set +-# CONFIG_FEATURE_TELNET_TTYPE is not set +-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set ++# CONFIG_TCPSVD is not set ++CONFIG_TELNET=y ++CONFIG_FEATURE_TELNET_TTYPE=y ++CONFIG_FEATURE_TELNET_AUTOLOGIN=y + # CONFIG_TELNETD is not set + # CONFIG_FEATURE_TELNETD_STANDALONE is not set ++# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set + # CONFIG_TFTP is not set ++# CONFIG_TFTPD 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_FEATURE_TRACEROUTE_VERBOSE is not set +-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +-# CONFIG_APP_UDHCPD is not set +-# CONFIG_APP_DHCPRELAY is not set +-# CONFIG_APP_DUMPLEASES is not set ++# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set ++# CONFIG_TFTP_DEBUG is not set ++CONFIG_TRACEROUTE=y ++CONFIG_TRACEROUTE6=y ++CONFIG_FEATURE_TRACEROUTE_VERBOSE=y ++CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y ++CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y ++# 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 + # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +-CONFIG_APP_UDHCPC=y +-# CONFIG_FEATURE_UDHCP_DEBUG is not set +-# CONFIG_FEATURE_RFC3397 is not set ++CONFIG_DHCPD_LEASES_FILE="" ++CONFIG_UDHCPC=y ++CONFIG_FEATURE_UDHCPC_ARPING=y ++CONFIG_FEATURE_UDHCP_PORT=y ++CONFIG_UDHCP_DEBUG=9 ++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="" ++# CONFIG_UDPSVD is not set + # CONFIG_VCONFIG is not set + CONFIG_WGET=y +-# CONFIG_FEATURE_WGET_STATUSBAR is not set +-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set ++CONFIG_FEATURE_WGET_STATUSBAR=y ++CONFIG_FEATURE_WGET_AUTHENTICATION=y + # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set + # CONFIG_ZCIP is not set + + # ++# Print Utilities ++# ++# CONFIG_LPD is not set ++# CONFIG_LPR is not set ++# CONFIG_LPQ is not set ++ ++# ++# Mail Utilities ++# ++# CONFIG_MAKEMIME is not set ++CONFIG_FEATURE_MIME_CHARSET="" ++# CONFIG_POPMAILDIR is not set ++# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set ++# CONFIG_REFORMIME is not set ++# CONFIG_FEATURE_REFORMIME_COMPAT is not set ++# CONFIG_SENDMAIL is not set ++ ++# + # Process Utilities + # ++# CONFIG_SMEMCAP is not set + CONFIG_FREE=y +-# CONFIG_FUSER is not set ++CONFIG_FUSER=y + CONFIG_KILL=y + CONFIG_KILLALL=y + # CONFIG_KILLALL5 is not set + # CONFIG_NMETER is not set +-# CONFIG_PIDOF is not set +-# CONFIG_FEATURE_PIDOF_SINGLE is not set +-# CONFIG_FEATURE_PIDOF_OMIT is not set ++CONFIG_PGREP=y ++CONFIG_PIDOF=y ++CONFIG_FEATURE_PIDOF_SINGLE=y ++CONFIG_FEATURE_PIDOF_OMIT=y ++CONFIG_PKILL=y + CONFIG_PS=y +-# CONFIG_FEATURE_PS_WIDE is not set ++CONFIG_FEATURE_PS_WIDE=y ++# CONFIG_FEATURE_PS_TIME is not set ++# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set ++# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set + # 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_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +-# CONFIG_FEATURE_TOP_DECIMALS is not set ++CONFIG_BB_SYSCTL=y ++CONFIG_TOP=y ++CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y ++CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y ++CONFIG_FEATURE_TOP_SMP_CPU=y ++CONFIG_FEATURE_TOP_DECIMALS=y ++CONFIG_FEATURE_TOP_SMP_PROCESS=y ++CONFIG_FEATURE_TOPMEM=y ++CONFIG_FEATURE_SHOW_THREADS=y + CONFIG_UPTIME=y + # CONFIG_WATCH is not set + + # +-# Shells ++# Runit Utilities + # +-CONFIG_FEATURE_SH_IS_ASH=y +-# CONFIG_FEATURE_SH_IS_HUSH is not set +-# CONFIG_FEATURE_SH_IS_LASH is not set +-# CONFIG_FEATURE_SH_IS_MSH is not set +-# CONFIG_FEATURE_SH_IS_NONE is not set +-CONFIG_ASH=y ++# CONFIG_RUNSV is not set ++# CONFIG_RUNSVDIR is not set ++# CONFIG_FEATURE_RUNSVDIR_LOG is not set ++# CONFIG_SV is not set ++CONFIG_SV_DEFAULT_SERVICE_DIR="" ++# CONFIG_SVLOGD is not set ++# CONFIG_CHPST is not set ++# CONFIG_SETUIDGID is not set ++# CONFIG_ENVUIDGID is not set ++# CONFIG_ENVDIR is not set ++# CONFIG_SOFTLIMIT is not set ++# CONFIG_CHCON is not set ++# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set ++# CONFIG_GETENFORCE is not set ++# CONFIG_GETSEBOOL is not set ++# CONFIG_LOAD_POLICY is not set ++# CONFIG_MATCHPATHCON is not set ++# CONFIG_RESTORECON is not set ++# CONFIG_RUNCON is not set ++# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set ++# CONFIG_SELINUXENABLED is not set ++# CONFIG_SETENFORCE is not set ++# CONFIG_SETFILES is not set ++# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set ++# CONFIG_SETSEBOOL is not set ++# CONFIG_SESTATUS is not set + + # +-# Ash Shell Options ++# Shells + # ++CONFIG_ASH=y ++CONFIG_ASH_BASH_COMPAT=y + CONFIG_ASH_JOB_CONTROL=y +-# CONFIG_ASH_READ_NCHARS is not set +-CONFIG_ASH_READ_TIMEOUT=y + CONFIG_ASH_ALIAS=y +-CONFIG_ASH_MATH_SUPPORT=y +-# CONFIG_ASH_MATH_SUPPORT_64 is not set +-# CONFIG_ASH_GETOPTS is not set +-# CONFIG_ASH_BUILTIN_ECHO is not set ++CONFIG_ASH_GETOPTS=y ++CONFIG_ASH_BUILTIN_ECHO=y ++CONFIG_ASH_BUILTIN_PRINTF=y + CONFIG_ASH_BUILTIN_TEST=y + # CONFIG_ASH_CMDCMD is not set + CONFIG_ASH_MAIL=y +@@ -685,20 +919,31 @@ + # CONFIG_ASH_RANDOM_SUPPORT is not set + # CONFIG_ASH_EXPAND_PRMT is not set + # CONFIG_HUSH is not set ++# CONFIG_HUSH_BASH_COMPAT is not set + # CONFIG_HUSH_HELP is not set + # CONFIG_HUSH_INTERACTIVE is not set + # CONFIG_HUSH_JOB is not set + # CONFIG_HUSH_TICK is not set + # CONFIG_HUSH_IF is not set + # CONFIG_HUSH_LOOPS is not set ++# 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_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 +- +-# +-# Bourne Shell Options +-# ++CONFIG_SH_MATH_SUPPORT=y ++CONFIG_SH_MATH_SUPPORT_64=y + # CONFIG_FEATURE_SH_EXTRA_QUIET is not set + # CONFIG_FEATURE_SH_STANDALONE is not set ++# CONFIG_FEATURE_SH_NOFORK is not set + # CONFIG_CTTYHACK is not set + + # +@@ -707,41 +952,11 @@ + # CONFIG_SYSLOGD is not set + # 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= ++CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 + # CONFIG_LOGREAD is not set + # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set + # CONFIG_KLOGD is not set + # CONFIG_LOGGER is not set +- +-# +-# Runit Utilities +-# +-# CONFIG_RUNSV is not set +-# CONFIG_RUNSVDIR is not set +-# CONFIG_SV is not set +-# CONFIG_SVLOGD is not set +-# CONFIG_CHPST is not set +-# CONFIG_SETUIDGID is not set +-# CONFIG_ENVUIDGID is not set +-# CONFIG_ENVDIR is not set +-# CONFIG_SOFTLIMIT is not set +-# CONFIG_CHCON is not set +-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +-# CONFIG_GETENFORCE is not set +-# CONFIG_GETSEBOOL is not set +-# CONFIG_LOAD_POLICY is not set +-# CONFIG_MATCHPATHCON is not set +-# CONFIG_RESTORECON is not set +-# CONFIG_RUNCON is not set +-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +-# CONFIG_SELINUXENABLED is not set +-# CONFIG_SETENFORCE is not set +-# CONFIG_SETFILES is not set +-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +- +-# +-# ipsvd utilities +-# +-# CONFIG_TCPSVD is not set +-# CONFIG_UDPSVD is not set +diff -Naur genkernel-3.4.10.907.orig/gen_compile.sh genkernel-3.4.10.907/gen_compile.sh +--- genkernel-3.4.10.907.orig/gen_compile.sh 2009-12-17 04:21:37.000000000 +0000 ++++ genkernel-3.4.10.907/gen_compile.sh 2010-10-26 07:36:44.157511035 +0000 +@@ -201,7 +201,7 @@ + if [ -d "${GK_SHARE}/patches/${util}/${version}" ] + then + print_info 1 "${util}: >> Applying patches..." +- for i in ${GK_SHARE}/patches/${util}/${version}/*{diff,patch} ++ for i in ${GK_SHARE}/patches/${util}/${version}/*.* + do + patch_success=0 + for j in `seq 0 5` +@@ -524,37 +524,6 @@ + fi + } + +-compile_e2fsprogs() { +- if [ ! -f "${BLKID_BINCACHE}" ] +- then +- [ ! -f "${E2FSPROGS_SRCTAR}" ] && +- gen_die "Could not find e2fsprogs source tarball: ${E2FSPROGS_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!" +- cd "${TEMP}" +- rm -rf "${E2FSPROGS_DIR}" +- tar -zxpf "${E2FSPROGS_SRCTAR}" +- [ ! -d "${E2FSPROGS_DIR}" ] && +- gen_die "e2fsprogs directory ${E2FSPROGS_DIR} invalid" +- cd "${E2FSPROGS_DIR}" +- print_info 1 'e2fsprogs: >> Configuring...' +- ./configure --with-ldopts=-static >> ${LOGFILE} 2>&1 || +- gen_die 'Configuring e2fsprogs failed!' +- print_info 1 'e2fsprogs: >> Compiling...' +- MAKE=${UTILS_MAKE} compile_generic "" "" +- print_info 1 'blkid: >> Copying to cache...' +- [ -f "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" ] || +- gen_die 'Blkid executable does not exist!' +- strip "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" || +- gen_die 'Could not strip blkid binary!' +- bzip2 "${TEMP}/${E2FSPROGS_DIR}/misc/blkid" || +- gen_die 'bzip2 compression of blkid failed!' +- mv "${TEMP}/${E2FSPROGS_DIR}/misc/blkid.bz2" "${BLKID_BINCACHE}" || +- gen_die 'Could not copy the blkid binary to the package directory, does the directory exist?' +- +- cd "${TEMP}" +- rm -rf "${E2FSPROGS_DIR}" > /dev/null +- fi +-} +- + compile_fuse() { + if [ ! -f "${FUSE_BINCACHE}" ] + then +diff -Naur genkernel-3.4.10.907.orig/gen_funcs.sh genkernel-3.4.10.907/gen_funcs.sh +--- genkernel-3.4.10.907.orig/gen_funcs.sh 2009-12-17 04:21:37.000000000 +0000 ++++ genkernel-3.4.10.907/gen_funcs.sh 2010-10-26 07:18:46.497237245 +0000 +@@ -500,7 +500,7 @@ + } + + check_distfiles() { +- for i in $BUSYBOX_SRCTAR $DEVICE_MAPPER_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $E2FSPROGS_SRCTAR $ISCSI_SRCTAR ++ for i in $BUSYBOX_SRCTAR $DEVICE_MAPPER_SRCTAR $MULTIPATH_SRCTAR $LVM_SRCTAR $DMRAID_SRCTAR $ISCSI_SRCTAR + do + if [ ! -f "${i}" ] + then +diff -Naur genkernel-3.4.10.907.orig/gen_initramfs.sh genkernel-3.4.10.907/gen_initramfs.sh +--- genkernel-3.4.10.907.orig/gen_initramfs.sh 2009-12-17 04:21:37.000000000 +0000 ++++ genkernel-3.4.10.907/gen_initramfs.sh 2010-10-26 07:28:18.368732897 +0000 +@@ -67,22 +67,6 @@ + rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null + } + +-append_blkid(){ +- if [ -d "${TEMP}/initramfs-blkid-temp" ] +- then +- rm -r "${TEMP}/initramfs-blkid-temp/" +- fi +- cd ${TEMP} +- mkdir -p "${TEMP}/initramfs-blkid-temp/bin/" +- [ "${DISKLABEL}" -eq '1' ] && { /bin/bzip2 -dc "${BLKID_BINCACHE}" > "${TEMP}/initramfs-blkid-temp/bin/blkid" || +- gen_die "Could not extract blkid binary cache!"; } +- chmod a+x "${TEMP}/initramfs-blkid-temp/bin/blkid" +- cd "${TEMP}/initramfs-blkid-temp/" +- find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" +- cd "${TEMP}" +- rm -rf "${TEMP}/initramfs-blkid-temp" > /dev/null +-} +- + #append_fuse() { + # if [ -d "${TEMP}/initramfs-fuse-temp" ] + # then +@@ -634,8 +618,6 @@ + print_info 1 "initramfs: Not copying modules..." + fi + +- append_data 'blkid' "${DISKLABEL}" +- + append_data 'unionfs_fuse' "${UNIONFS}" + + append_data 'splash' "${SPLASH}" +diff -Naur genkernel-3.4.10.907.orig/genkernel genkernel-3.4.10.907/genkernel +--- genkernel-3.4.10.907.orig/genkernel 2009-12-17 04:21:37.000000000 +0000 ++++ genkernel-3.4.10.907/genkernel 2010-10-26 07:19:56.589930776 +0000 +@@ -279,8 +279,6 @@ + + if [ "${BUILD_RAMDISK}" -eq '1' ] + then +- [ "${DISKLABEL}" -eq '1' ] && compile_e2fsprogs +- + if [ "${BUSYBOX}" -eq '1' ] + then + # Compile Busybox +diff -Naur genkernel-3.4.10.907.orig/genkernel.conf genkernel-3.4.10.907/genkernel.conf +--- genkernel-3.4.10.907.orig/genkernel.conf 2009-12-17 04:21:37.000000000 +0000 ++++ genkernel-3.4.10.907/genkernel.conf 2010-10-26 07:28:59.286553380 +0000 +@@ -80,7 +80,7 @@ + # Specify specific firmware files to include. This overrides FIRMWARE_DIR + # FIRMWARE_FILES="" + +-# Enable disklabel support (copies blkid to initrd) ++# Enable disklabel support + DISKLABEL="yes" + + # Add new kernel to grub? +@@ -172,11 +172,6 @@ + ISCSI_SRCTAR="${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz" + ISCSI_BINCACHE="%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2" + +-E2FSPROGS_VER="VERSION_E2FSPROGS" +-E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}" +-E2FSPROGS_SRCTAR="${DISTDIR}/e2fsprogs-${E2FSPROGS_VER}.tar.gz" +-BLKID_BINCACHE="%%CACHE%%/blkid-${E2FSPROGS_VER}-%%ARCH%%.bz2" +- + FUSE_VER="VERSION_FUSE" + FUSE_DIR="fuse-${FUSE_VER}" + FUSE_SRCTAR="${DISTDIR}/fuse-${FUSE_VER}.tar.gz" +diff -Naur genkernel-3.4.10.907.orig/patches/busybox/1.17.3/busybox-1.17.0-bb.patch genkernel-3.4.10.907/patches/busybox/1.17.3/busybox-1.17.0-bb.patch +--- genkernel-3.4.10.907.orig/patches/busybox/1.17.3/busybox-1.17.0-bb.patch 1970-01-01 00:00:00.000000000 +0000 ++++ genkernel-3.4.10.907/patches/busybox/1.17.3/busybox-1.17.0-bb.patch 2010-08-15 03:22:41.000000000 +0000 +@@ -0,0 +1,23 @@ ++--- a/include/applets.src.h +++++ b/include/applets.src.h ++@@ -77,7 +77,9 @@ ++ IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename)) ++ IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash)) ++ IF_FEATURE_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, _BB_DIR_BIN, _BB_SUID_DROP, bash)) +++IF_ASH(APPLET_ODDNAME(bb, ash, _BB_DIR_BIN, _BB_SUID_DROP, ash)) ++ IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) +++IF_ASH(APPLET_ODDNAME(bbsh, ash, _BB_DIR_BIN, _BB_SUID_DROP, ash)) ++ //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)) ++--- a/shell/ash.c +++++ b/shell/ash.c ++@@ -7255,6 +7255,8 @@ ++ } ++ /* re-exec ourselves with the new arguments */ ++ execve(bb_busybox_exec_path, argv, envp); +++ execve("/bin/busybox.static", argv, envp); +++ execve("/bin/busybox", argv, envp); ++ /* If they called chroot or otherwise made the binary no longer ++ * executable, fall through */ ++ } +diff -Naur genkernel-3.4.10.907.orig/patches/busybox/1.17.3/busybox-1.17.1-date.patch genkernel-3.4.10.907/patches/busybox/1.17.3/busybox-1.17.1-date.patch +--- genkernel-3.4.10.907.orig/patches/busybox/1.17.3/busybox-1.17.1-date.patch 1970-01-01 00:00:00.000000000 +0000 ++++ genkernel-3.4.10.907/patches/busybox/1.17.3/busybox-1.17.1-date.patch 2010-09-28 16:53:47.000000000 +0000 +@@ -0,0 +1,32 @@ ++http://bugs.gentoo.org/335947 ++ ++From f2da16f451812f40bed51fd60a304df3d7dfc1bd Mon Sep 17 00:00:00 2001 ++From: Denys Vlasenko ++Date: Sun, 6 Jun 2010 17:53:48 +0200 ++Subject: [PATCH] date: make FEATURE_NANO compile on glibc systems ++ ++Signed-off-by: Denys Vlasenko ++--- ++ coreutils/date.c | 6 +++++- ++ 1 files changed, 5 insertions(+), 1 deletions(-) ++ ++diff --git a/coreutils/date.c b/coreutils/date.c ++index c599df7..3d78a53 100644 ++--- a/coreutils/date.c +++++ b/coreutils/date.c ++@@ -204,7 +204,11 @@ int date_main(int argc UNUSED_PARAM, char **argv) ++ xstat(filename, &statbuf); ++ ts.tv_sec = statbuf.st_mtime; ++ #if ENABLE_FEATURE_DATE_NANO ++- ts.tv_nsec = statbuf.st_mtim.tv_nsec; +++# if defined __GLIBC__ && !defined __UCLIBC__ +++ ts.tv_nsec = statbuf.st_mtim.tv_nsec; +++# else +++ ts.tv_nsec = statbuf.st_mtimensec; +++# endif ++ #endif ++ } else { ++ #if ENABLE_FEATURE_DATE_NANO ++-- ++1.7.3 ++ +diff -Naur genkernel-3.4.10.907.orig/patches/busybox/1.17.3/busybox-1.7.4-signal-hack.patch genkernel-3.4.10.907/patches/busybox/1.17.3/busybox-1.7.4-signal-hack.patch +--- genkernel-3.4.10.907.orig/patches/busybox/1.17.3/busybox-1.7.4-signal-hack.patch 1970-01-01 00:00:00.000000000 +0000 ++++ genkernel-3.4.10.907/patches/busybox/1.17.3/busybox-1.7.4-signal-hack.patch 2009-12-17 04:21:37.000000000 +0000 +@@ -0,0 +1,28 @@ ++workaround while we get it fixed upstream ++ ++http://bugs.gentoo.org/201114 ++ ++--- libbb/u_signal_names.c +++++ libbb/u_signal_names.c ++@@ -66,7 +66,7 @@ ++ #ifdef SIGTERM ++ [SIGTERM ] = "TERM", ++ #endif ++-#ifdef SIGSTKFLT +++#if defined(SIGSTKFLT) && SIGSTKFLT < 32 ++ [SIGSTKFLT] = "STKFLT", ++ #endif ++ #ifdef SIGCHLD ++@@ -90,10 +90,10 @ ++ #ifdef SIGURG ++ [SIGURG ] = "URG", ++ #endif ++-#ifdef SIGXCPU +++#if defined(SIGXCPU) && SIGXCPU < 32 ++ [SIGXCPU ] = "XCPU", ++ #endif ++-#ifdef SIGXFSZ +++#if defined(SIGXFSZ) && SIGXFSZ < 32 ++ [SIGXFSZ ] = "XFSZ", ++ #endif ++ #ifdef SIGVTALRM diff --git a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-nice-option.patch b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-nice-option.patch deleted file mode 100644 index ef8a8b2..0000000 --- a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-nice-option.patch +++ /dev/null @@ -1,215 +0,0 @@ -Index: genkernel.8 -=================================================================== ---- genkernel.8 (.../3.4.10.907-jrg-mod2) (revision 974) -+++ genkernel.8 (.../3.4.10.907-jrg-mod3) (revision 974) -@@ -47,7 +47,7 @@ - behaviour. Certain options have ``\fB--no-\fR'' variants which - do the opposite thing. You can specify your options in any order. - .PP --.BR Debugging \ Options -+.BR Debugging\ Options - .TP - \fB\-\-loglevel=\fR<0-5> - This controls the out verbosity level of genkernel output - if this is set -@@ -61,7 +61,7 @@ - \fB\-\-\fR[no\-]\fBcolor\fR - Turns on, or off, output in color using escape sequences. - .PP --.BR Kernel \ Configuration -+.BR Kernel\ Configuration - .TP - \fB\-\-\fR[no\-]\fBmenuconfig\fR - Runs, or does not run "make menuconfig" after running "make oldconfig". -@@ -79,7 +79,7 @@ - .I /etc/kernels - if the kernel is successfully compiled. - .PP --.BR Kernel \ Compilation -+.BR Kernel\ Compilation - .TP - \fB\-\-\fR[no\-]\fBclean\fR - Runs, or does not run, "make clean" before compilation - this erases any -@@ -129,11 +129,21 @@ - Implies \fB\-\-no\-clean\fR, and thus \fB\-\-no\-mrproper\fR, running a - "make oldconfig". - .TP -+\fB\-\-makeopts=\fR -+GNU Make options such as \fB\-j2\fR, etc. -+.TP -+\fB\-\-\fR[no\-]\fBnice\fR -+Runs the kernel make at the default niceness (reduction in priority) of 10, or -+in the case of --no-nice, runs the kernel make at normal priority. -+.TP -+\fB\-\-nice=\fR -+Runs the kernel make at the specified niceness (reduction in priority). -+.TP - \fB\-\-callback=\fR<...> - Run the specified arguments in the current environment after the kernel and - modules have been compiled. - .PP --.BR Kernel \ Locations -+.BR Kernel\ Locations - .TP - \fB\-\-kerneldir=\fR - This specifies the location of the kernel sources; the default is -@@ -144,7 +154,7 @@ - default genkernel uses the config from the previous build of the same kernel - version or a default kernel config if there isn't a previous config. - .PP --.BR Low-Level \ Compilation \ Options -+.BR Low-Level\ Compilation\ Options - .TP - \fB\-\-kernel\-cc=\fR - Compiler to use for the kernel compilation (e.g. distcc). -@@ -169,9 +179,6 @@ - .TP - \fB\-\-utils\-make=\fR - GNU Make to use for utilities. --.TP --\fB\-\-makeopts=\fR --GNU Make options such as \fB\-j2\fR, etc. - .PP - .BR Initialization - .TP -@@ -225,7 +232,7 @@ - \fB\-\-tempdir=\fR - Sets genkernel's temporary working directory to . - .PP --.BR Output \ Settings -+.BR Output\ Settings - .TP - \fB\-\-kernname=\fR<...> - Tag the kernel and initrd with a name, if not defined this option defaults to genkernel -Index: gen_compile.sh -=================================================================== ---- gen_compile.sh (.../3.4.10.907-jrg-mod2) (revision 974) -+++ gen_compile.sh (.../3.4.10.907-jrg-mod3) (revision 974) -@@ -244,24 +244,31 @@ - esac - shift 2 - -+ if [ ${NICE} -ne 0 ] -+ then -+ NICEOPTS="nice -n${NICE} " -+ else -+ NICEOPTS="" -+ fi -+ - # the eval usage is needed in the next set of code - # as ARGS can contain spaces and quotes, eg: - # ARGS='CC="ccache gcc"' - if [ "${argstype}" == 'runtask' ] - then -- print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/-j1} ${ARGS} ${target} $*" 1 0 1 -- eval ${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $* -+ print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS/-j?/-j1} ${ARGS} ${target} $*" 1 0 1 -+ eval ${NICEOPTS}${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $* - RET=$? - elif [ "${LOGLEVEL}" -gt "1" ] - then - # Output to stdout and logfile -- print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1 -- eval ${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* 2>&1 | tee -a ${LOGFILE} -+ print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1 -+ eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* 2>&1 | tee -a ${LOGFILE} - RET=${PIPESTATUS[0]} - else - # Output to logfile only -- print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} ${ARGS} ${1} $*" 1 0 1 -- eval ${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* >> ${LOGFILE} 2>&1 -+ print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${1} $*" 1 0 1 -+ eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* >> ${LOGFILE} 2>&1 - RET=$? - fi - [ "${RET}" -ne '0' ] && -Index: genkernel -=================================================================== ---- genkernel (.../3.4.10.907-jrg-mod2) (revision 974) -+++ genkernel (.../3.4.10.907-jrg-mod3) (revision 974) -@@ -4,10 +4,6 @@ - PATH="${PATH}:/sbin:/usr/sbin" - GK_V='3.4.10.907' - --# Set the default for TMPDIR. May be modified by genkernel.conf or the --# --tempdir command line option. --TMPDIR='/var/tmp/genkernel' -- - TODEBUGCACHE=1 # Until an error occurs or LOGFILE is fully qualified. - - small_die() { -@@ -53,8 +49,8 @@ - } - - cleanup(){ -- if [ -n "$TEMP" -a -d "$TEMP" ]; then -- rm -rf "$TEMP" -+ if [ -n "${TEMP}" -a -d "${TEMP}" ]; then -+ rm -rf "${TEMP}" - fi - - if isTrue ${POSTCLEAR} -Index: gen_cmdline.sh -=================================================================== ---- gen_cmdline.sh (.../3.4.10.907-jrg-mod2) (revision 974) -+++ gen_cmdline.sh (.../3.4.10.907-jrg-mod3) (revision 974) -@@ -47,6 +47,10 @@ - echo " --static Build a static (monolithic kernel)" - echo " --genzimage Build zImage.initrd for PowerPC arch" - echo " --no-genzimage Do not build zImage.initrd" -+ echo " --nice Run the kernel make at the default nice level (10)." -+ echo " --nice=<0-19> Run the kernel make at the selected nice level." -+ echo " --no-nice Don't be nice while running the kernel make." -+ - echo " Kernel settings" - echo " --kerneldir= Location of the kernel sources" - echo " --kernel-config= Kernel configuration file to use for compilation" -@@ -595,6 +599,23 @@ - --config=*) - print_info 2 "CMD_GK_CONFIG: `parse_opt "$*"`" - ;; -+ --nice) -+ CMD_NICE=10 -+ print_info 2 "CMD_NICE: ${CMD_NICE}" -+ ;; -+ --nice=*) -+ CMD_NICE=`parse_opt "$*"` -+ if [ ${CMD_NICE} -lt 0 -o ${CMD_NICE} -gt 19 ] -+ then -+ echo "Error: Illegal value specified for --nice= parameter." -+ exit 1 -+ fi -+ print_info 2 "CMD_NICE: ${CMD_NICE}" -+ ;; -+ --no-nice) -+ CMD_NICE=0 -+ print_info 2 "CMD_NICE: ${CMD_NICE}" -+ ;; - all) - BUILD_KERNEL=1 - BUILD_MODULES=1 -Index: gen_determineargs.sh -=================================================================== ---- gen_determineargs.sh (.../3.4.10.907-jrg-mod2) (revision 974) -+++ gen_determineargs.sh (.../3.4.10.907-jrg-mod3) (revision 974) -@@ -133,6 +133,7 @@ - set_config_with_override 1 SLOWUSB CMD_SLOWUSB - set_config_with_override 2 UTILS_ARCH CMD_UTILS_ARCH - set_config_with_override 2 TMPDIR CMD_TMPDIR "/var/tmp/genkernel" -+ set_config_with_override 2 NICE CMD_NICE "10" - - BOOTDIR=`arch_replace "${BOOTDIR}"` - BOOTDIR=${BOOTDIR%/} # Remove any trailing slash -Index: genkernel.conf -=================================================================== ---- genkernel.conf (.../3.4.10.907-jrg-mod2) (revision 974) -+++ genkernel.conf (.../3.4.10.907-jrg-mod3) (revision 974) -@@ -61,6 +61,9 @@ - # argument is: *+1 - # MAKEOPTS="-j2" - -+# Run the kernel make at the following NICE level. Default is 10. -+# NICE=10 -+ - # Add in LVM support from static binaries if they exist on the system, or - # compile static LVM binaries if static ones do not exist. - # LVM="no" diff --git a/sys-kernel/genkernel/genkernel-3.4.10.907-r13.ebuild b/sys-kernel/genkernel/genkernel-3.4.10.907-r13.ebuild index 115cd8e..ebfa677 100644 --- a/sys-kernel/genkernel/genkernel-3.4.10.907-r13.ebuild +++ b/sys-kernel/genkernel/genkernel-3.4.10.907-r13.ebuild @@ -8,9 +8,8 @@ VERSION_BUSYBOX='1.17.3' VERSION_DMAP='1.02.28' -VERSION_DMRAID='1.0.0.rc14' -VERSION_E2FSPROGS='1.41.12' -VERSION_FUSE='2.8.5' +VERSION_DMRAID='1.0.0.rc16' +VERSION_FUSE='2.7.4' VERSION_ISCSI='2.0-871' VERSION_LVM='2.02.75' VERSION_MDADM='3.1.4' @@ -29,7 +28,6 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2 ${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz - mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2 http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2" @@ -57,9 +55,9 @@ SLOT="0" RESTRICT="" # Please don't touch individual KEYWORDS. Since this is maintained/tested by # Release Engineering, it's easier for us to deal with all arches at once. -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" #KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86" -KEYWORDS="~arm" +#KEYWORDS="~arm" IUSE="ibm selinux" DEPEND="sys-fs/e2fsprogs @@ -90,7 +88,6 @@ src_install() { -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \ -e "s:VERSION_DMAP:$VERSION_DMAP:" \ -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \ - -e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \ -e "s:VERSION_FUSE:$VERSION_FUSE:" \ -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \ -e "s:VERSION_LVM:$VERSION_LVM:" \ @@ -120,7 +117,6 @@ src_install() { "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \ "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \ "${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \ - "${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \ "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \ "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \ "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \