diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-05-25 15:36:14 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-05-25 15:36:14 +0100 |
| commit | 615a98ed9a021da245513790c064761a0a5a67e9 (patch) | |
| tree | cba72ce890e46d97e86edc2845dd379f98712907 /meta/packages | |
| parent | cd62d697e1c746bad6dd29030f03a36750a1957e (diff) | |
| download | openembedded-core-615a98ed9a021da245513790c064761a0a5a67e9.tar.gz openembedded-core-615a98ed9a021da245513790c064761a0a5a67e9.tar.bz2 openembedded-core-615a98ed9a021da245513790c064761a0a5a67e9.zip | |
busybox: bump to 1.15.3 from OE
Import the 1.15.3 recipe from OpenEmbedded and tweak to match Poky style
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/packages')
24 files changed, 619 insertions, 392 deletions
diff --git a/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch b/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch new file mode 100644 index 0000000000..c737f172b1 --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/0000-wget-no-check-certificate.patch @@ -0,0 +1,12 @@ +diff --git a/networking/wget.c b/networking/wget.c +index 9d813dc..09edd67 100644 +--- a/networking/wget.c ++++ b/networking/wget.c +@@ -546,6 +546,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv) + "passive-ftp\0" No_argument "\xff" + "header\0" Required_argument "\xfe" + "post-data\0" Required_argument "\xfd" ++ "no-check-certificate\0" No_argument "\xfc" + ; + #endif + diff --git a/meta/packages/busybox/busybox-1.15.3/B921600.patch b/meta/packages/busybox/busybox-1.15.3/B921600.patch new file mode 100644 index 0000000000..61cc32b0e5 --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/B921600.patch @@ -0,0 +1,13 @@ +diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c +--- busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.000000000 +0200 ++++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200 +@@ -52,6 +52,9 @@ static const struct speed_map speeds[] = + #ifdef B460800 + {B460800, 460800/256 + 0x8000U}, + #endif ++#ifdef B921600 ++ {B921600, 921600/256 + 0x8000U}, ++#endif + }; + + enum { NUM_SPEEDS = ARRAY_SIZE(speeds) }; diff --git a/meta/packages/busybox/busybox-1.9.1/defconfig b/meta/packages/busybox/busybox-1.15.3/defconfig index a0768d4bb8..ddbaa0839d 100644 --- a/meta/packages/busybox/busybox-1.9.1/defconfig +++ b/meta/packages/busybox/busybox-1.15.3/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.9.1 -# Wed Oct 8 16:19:41 2008 +# Busybox version: 1.13.2 +# Sun Feb 8 17:22:39 2009 # CONFIG_HAVE_DOT_CONFIG=y @@ -12,13 +12,14 @@ CONFIG_HAVE_DOT_CONFIG=y # # 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_FEATURE_ASSUME_UNICODE=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 CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set +CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y # CONFIG_FEATURE_INSTALLER is not set CONFIG_LOCALE_SUPPORT=y @@ -39,15 +40,19 @@ CONFIG_FEATURE_HAVE_RPC=y # Build Options # # CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_INDIVIDUAL is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" # # 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 @@ -76,16 +81,17 @@ CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_FANCY_KEYS=y # CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_HISTORY=64 CONFIG_FEATURE_EDITING_SAVEHISTORY=y CONFIG_FEATURE_TAB_COMPLETION=y CONFIG_FEATURE_USERNAME_COMPLETION=y CONFIG_FEATURE_EDITING_FANCY_PROMPT=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 @@ -94,45 +100,38 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # # Archival Utilities # +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y CONFIG_AR=y # CONFIG_FEATURE_AR_LONG_FILENAMES is not set CONFIG_BUNZIP2=y # CONFIG_BZIP2 is not set CONFIG_CPIO=y +# CONFIG_FEATURE_CPIO_O is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set CONFIG_GZIP=y # 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=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y # 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_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set # CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNZIP=y # -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# # Coreutils # CONFIG_BASENAME=y @@ -148,12 +147,12 @@ CONFIG_CHROOT=y CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y # CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y -# CONFIG_FEATURE_DF_INODE is not set +CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set @@ -170,7 +169,7 @@ CONFIG_EXPR=y CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set +CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set @@ -193,8 +192,8 @@ CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y CONFIG_NOHUP=y CONFIG_OD=y # CONFIG_PRINTENV is not set @@ -205,10 +204,12 @@ CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_FEATURE_FLOAT_SLEEP=y CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y # CONFIG_SPLIT is not set @@ -218,10 +219,11 @@ CONFIG_FEATURE_SORT_BIG=y CONFIG_STTY=y # CONFIG_SUM is not set CONFIG_SYNC=y +# CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y @@ -279,8 +281,12 @@ CONFIG_RESET=y # CONFIG_FEATURE_RESIZE_PRINT is not set CONFIG_SETCONSOLE=y # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_SETKEYCODES is not set # CONFIG_SETLOGCONS is not set +CONFIG_SHOWKEY=y # # Debian Utilities @@ -289,7 +295,7 @@ CONFIG_MKTEMP=y # CONFIG_PIPE_PROGRESS is not set CONFIG_RUN_PARTS=y CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_FEATURE_RUN_PARTS_FANCY=y CONFIG_START_STOP_DAEMON=y CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y @@ -299,12 +305,12 @@ CONFIG_WHICH=y # Editors # CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y +CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y CONFIG_DIFF=y CONFIG_FEATURE_DIFF_BINARY=y CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_FEATURE_DIFF_MINIMAL=y # CONFIG_ED is not set CONFIG_PATCH=y CONFIG_SED=y @@ -315,10 +321,10 @@ CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y CONFIG_FEATURE_VI_USE_SIGNALS=y -# CONFIG_FEATURE_VI_DOT_CMD is not set +CONFIG_FEATURE_VI_DOT_CMD=y # CONFIG_FEATURE_VI_READONLY is not set # CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y @@ -335,7 +341,7 @@ CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_INUM=y CONFIG_FEATURE_FIND_EXEC=y CONFIG_FEATURE_FIND_USER=y CONFIG_FEATURE_FIND_GROUP=y @@ -344,7 +350,7 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_DELETE=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -354,54 +360,57 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set +CONFIG_INIT=y +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +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 is not set +CONFIG_FEATURE_INITRD=y CONFIG_HALT=y # CONFIG_MESG is not set # # Login/Password Management Utilities # -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set +CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP 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_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +CONFIG_DELUSER=y +CONFIG_GETTY=y CONFIG_FEATURE_UTMP=y -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y # 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_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y # # Linux Ext2 FS Progs @@ -413,30 +422,36 @@ CONFIG_FSCK=y # # Linux Module Utilities # +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" +# 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 is not set # # Options common to multiple modutils # -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y # CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set +# 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_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y # # Linux System Utilities # +CONFIG_BLKID=y CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y @@ -450,9 +465,10 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set +CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_FDISK_ADVANCED=y +# CONFIG_FINDFS is not set +CONFIG_FREERAMDISK=y CONFIG_FSCK_MINIX=y CONFIG_MKFS_MINIX=y @@ -460,38 +476,64 @@ CONFIG_MKFS_MINIX=y # Minix filesystem support # CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set +CONFIG_GETOPT=y CONFIG_HEXDUMP=y -# CONFIG_HD is not set # CONFIG_FEATURE_HEXDUMP_REVERSE is not set +# CONFIG_HD is not set 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_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y # CONFIG_FEATURE_MKSWAP_V0 is not set CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_VOLUMEID=y +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_FAKE is not set +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y -# CONFIG_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y -# CONFIG_READPROFILE is not set +CONFIG_RDEV=y +CONFIG_READPROFILE=y +CONFIG_RTCWAKE=y +# CONFIG_SCRIPT is not set # CONFIG_SETARCH is not set CONFIG_SWAPONOFF=y +# CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y -# CONFIG_FEATURE_UMOUNT_ALL is not set +CONFIG_FEATURE_UMOUNT_ALL=y # # Common options for mount/umount @@ -504,26 +546,43 @@ CONFIG_FEATURE_MOUNT_LOOP=y # # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set +# 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_CRONTAB is not set CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set +# CONFIG_DEVMEM is not set # CONFIG_EJECT is not set -# CONFIG_LAST is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +CONFIG_FBSPLASH=y +# CONFIG_INOTIFYD is not set +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_FLAGCS is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_MARKS is not set # CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_FEATURE_LESS_WINCH 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 @@ -531,18 +590,19 @@ CONFIG_FEATURE_LESS_FLAGS=y # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set +CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set CONFIG_MICROCOM=y # CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set # CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set +CONFIG_READAHEAD=y # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set -CONFIG_STRINGS=y # CONFIG_SETSID is not set +CONFIG_STRINGS=y # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y @@ -557,6 +617,9 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set # CONFIG_ARP is not set # 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_FAKEIDENTD is not set @@ -564,26 +627,27 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set 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_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +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_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_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFENSLAVE is not set CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" # CONFIG_FEATURE_IFUPDOWN_IP is not set @@ -619,39 +683,44 @@ CONFIG_FEATURE_IP_TUNNEL=y # 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_NC_SERVER=y +CONFIG_NC_EXTRA=y CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_PING=y CONFIG_PING6=y -# CONFIG_PSCAN is not set CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set CONFIG_TELNET=y # CONFIG_FEATURE_TELNET_TTYPE is not set CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set +CONFIG_TELNETD=y # CONFIG_FEATURE_TELNETD_STANDALONE is not set CONFIG_TFTP=y +# CONFIG_TFTPD is not set CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set +# CONFIG_TFTP_DEBUG is not set CONFIG_TRACEROUTE=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_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y CONFIG_APP_UDHCPD=y -# CONFIG_APP_DHCPRELAY is not set +CONFIG_APP_DHCPRELAY=y CONFIG_APP_DUMPLEASES=y # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" CONFIG_APP_UDHCPC=y CONFIG_FEATURE_UDHCPC_ARPING=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +# CONFIG_UDHCP_DEBUG is not set +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="@DATADIR@/udhcpc/default.script" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_VCONFIG is not set CONFIG_WGET=y @@ -659,6 +728,28 @@ CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y # CONFIG_ZCIP is not set +# CONFIG_TCPSVD is not set +# CONFIG_UDPSVD 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 +# CONFIG_FEATURE_SENDMAIL_MAILX is not set +# CONFIG_FEATURE_SENDMAIL_MAILXX is not set # # Process Utilities @@ -671,22 +762,56 @@ CONFIG_KILLALL=y # CONFIG_NMETER is not set # CONFIG_PGREP is not set CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y # CONFIG_PKILL is not set CONFIG_PS=y CONFIG_FEATURE_PS_WIDE=y +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y 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 is not set # CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set # CONFIG_FEATURE_TOPMEM is not set CONFIG_UPTIME=y CONFIG_WATCH=y # +# Runit Utilities +# +# 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 + +# # Shells # CONFIG_FEATURE_SH_IS_ASH=y @@ -698,6 +823,7 @@ CONFIG_ASH=y # # Ash Shell Options # +CONFIG_ASH_BASH_COMPAT=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_READ_NCHARS=y CONFIG_ASH_READ_TIMEOUT=y @@ -706,10 +832,11 @@ CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 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 is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set # CONFIG_ASH_RANDOM_SUPPORT is not set CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set @@ -719,6 +846,7 @@ CONFIG_ASH_EXPAND_PRMT=y # 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_LASH is not set # CONFIG_MSH is not set @@ -727,6 +855,7 @@ CONFIG_ASH_EXPAND_PRMT=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 # @@ -735,43 +864,10 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_SYSLOGD_DUP=y CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# 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 -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# ipsvd utilities -# -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set diff --git a/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch b/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch new file mode 100644 index 0000000000..633153f1ce --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/fdisk_lineedit_segfault.patch @@ -0,0 +1,12 @@ +--- old/libbb/lineedit.c 2008/09/27 01:28:56 23530 ++++ new/libbb/lineedit.c 2008/11/02 00:41:05 23898 +@@ -1412,7 +1412,8 @@ + if ((state->flags & SAVE_HISTORY) && state->hist_file) + load_history(state->hist_file); + #endif +- state->cur_history = state->cnt_history; ++ if (state->flags & DO_HISTORY) ++ state->cur_history = state->cnt_history; + + /* prepare before init handlers */ + cmdedit_y = 0; /* quasireal y, not true if line > xt*yt */ diff --git a/meta/packages/busybox/busybox-1.15.3/fix b/meta/packages/busybox/busybox-1.15.3/fix new file mode 100644 index 0000000000..544f41b256 --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/fix @@ -0,0 +1,31 @@ +--- + util-linux/mdev.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- busybox-1.13.2.orig/util-linux/mdev.c ++++ busybox-1.13.2/util-linux/mdev.c +@@ -107,11 +107,11 @@ static void make_device(char *path, int + + #if ENABLE_FEATURE_MDEV_CONF + parser = config_open2("/etc/mdev.conf", fopen_for_read); + + /* If we have config file, look up user settings */ +- while (config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)) { ++ while (config_read(parser, tokens, 5, 3, "# \t", PARSE_NORMAL)) { + regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; + char *val; + + /* Fields: regex uid:gid mode [alias] [cmd] */ + +@@ -211,10 +211,11 @@ static void make_device(char *path, int + } + #endif /* ENABLE_FEATURE_MDEV_RENAME */ + + #if ENABLE_FEATURE_MDEV_EXEC + /* The rest (opt): command to run */ ++ val = tokens[4]; + if (!val) + break; + { + const char *s = "@$*"; + const char *s2 = strchr(s, *val); diff --git a/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch b/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch new file mode 100644 index 0000000000..0121cd1b61 --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/get_header_tar.patch @@ -0,0 +1,11 @@ +--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 ++++ busybox-1.13.2/archival/libunarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 +@@ -252,6 +252,8 @@ + file_header->name = concat_path_file(tar.prefix, tar.name); + } else + file_header->name = xstrdup(tar.name); ++ if (strlen(file_header->name) > 100) ++ file_header->name[100] = 0; + } + + /* Set bits 12-15 of the files mode */ diff --git a/meta/packages/busybox/busybox-1.15.3/r24785.patch b/meta/packages/busybox/busybox-1.15.3/r24785.patch new file mode 100644 index 0000000000..e3e80befcd --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/r24785.patch @@ -0,0 +1,14 @@ +--- busybox/util-linux/mdev.c 2009/01/08 17:19:01 24725 ++++ busybox/util-linux/mdev.c 2009/01/12 07:57:52 24785 +@@ -179,8 +179,9 @@ + unsigned i, n; + #endif + char *a = val; +- s = strchr(val, ' '); +- val = (s && s[1]) ? s+1 : NULL; ++ s = strchrnul(val, ' '); ++ val = (s[0] && s[1]) ? s+1 : NULL; ++ s[0] = '\0'; + #if ENABLE_FEATURE_MDEV_RENAME_REGEXP + /* substitute %1..9 with off[1..9], if any */ + n = 0; diff --git a/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch b/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch new file mode 100644 index 0000000000..6f209ce571 --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch @@ -0,0 +1,12 @@ +diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h +--- busybox-1.15.3.orig//include/applets.h 2009-12-12 22:13:28.000000000 +0100 ++++ busybox-1.15.3/include/applets.h 2010-04-30 15:35:40.000000000 +0200 +@@ -323,7 +323,7 @@ + IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP)) + IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP)) + IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP)) +-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts)) ++IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_USR_BIN, _BB_SUID_DROP, run_parts)) + IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP)) + IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP)) + IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP)) diff --git a/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch b/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch new file mode 100644 index 0000000000..3b975b63f9 --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch @@ -0,0 +1,47 @@ +Index: busybox-1.15.1/examples/udhcp/simple.script +=================================================================== +--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-16 22:52:09.000000000 +0200 ++++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:57:11.424608476 +0200 +@@ -10,10 +10,17 @@ NETMASK="" + BROADCAST="broadcast +" + [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" + ++# return 0 if root is mounted on a network filesystem ++root_is_nfs() { ++ grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts ++} ++ + case "$1" in + deconfig) ++ if ! root_is_nfs ; then + echo "Setting IP address 0.0.0.0 on $interface" +- ifconfig $interface 0.0.0.0 ++ ifconfig $interface 0.0.0.0 ++ fi + ;; + + renew|bound) +@@ -21,15 +28,18 @@ case "$1" in + ifconfig $interface $ip $NETMASK $BROADCAST + + if [ -n "$router" ] ; then +- echo "Deleting routers" +- while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do +- : +- done ++ if ! root_is_nfs ; then ++ echo "Deleting routers" ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do ++ : ++ done ++ : ++ done + + metric=0 + for i in $router ; do + echo "Adding router $i" +- route add default gw $i dev $interface metric $((metric++)) ++ route add default gw $i dev $interface metric $((metric++)) 2>/dev/null + done + fi + diff --git a/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch b/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch new file mode 100644 index 0000000000..2ffba956ae --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/udhcpscript.patch @@ -0,0 +1,13 @@ +Index: busybox-1.15.1/examples/udhcp/simple.script +=================================================================== +--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-12 17:55:36.000000000 +0200 ++++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:51:06.599693412 +0200 +@@ -22,7 +22,7 @@ case "$1" in + + if [ -n "$router" ] ; then + echo "Deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + diff --git a/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch b/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch new file mode 100644 index 0000000000..df64554ffc --- /dev/null +++ b/meta/packages/busybox/busybox-1.15.3/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); diff --git a/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch b/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch deleted file mode 100644 index f221d30895..0000000000 --- a/meta/packages/busybox/busybox-1.9.1/adduser-longops.patch +++ /dev/null @@ -1,55 +0,0 @@ -upstream: http://bugs.busybox.net/view.php?id=2134 -status: accepted in rev. 21031 on Feb 15 2008 -comment: fixes OE bug 3781, applied by mickeyl - -diff -Nuar busybox-1.9.1.old/loginutils/Config.in busybox-1.9.1/loginutils/Config.in ---- busybox-1.9.1.old/loginutils/Config.in Tue Feb 12 10:03:11 2008 -+++ busybox-1.9.1/loginutils/Config.in Thu Feb 14 11:48:31 2008 -@@ -88,6 +88,13 @@ - help - Utility for creating a new user account. - -+config FEATURE_ADDUSER_LONG_OPTIONS -+ bool "Enable long options" -+ default n -+ depends on ADDUSER && GETOPT_LONG -+ help -+ Support long options for the adduser applet. -+ - config DELUSER - bool "deluser" - default n -diff -Nuar busybox-1.9.1.old/loginutils/adduser.c busybox-1.9.1/loginutils/adduser.c ---- busybox-1.9.1.old/loginutils/adduser.c Thu Feb 14 10:25:33 2008 -+++ busybox-1.9.1/loginutils/adduser.c Thu Feb 14 13:32:47 2008 -@@ -66,6 +66,19 @@ - bb_error_msg_and_die("cannot execute %s, you must set password manually", prog); - } - -+#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS -+static const char adduser_longopts[] ALIGN1 = -+ "home\0" Required_argument "h" -+ "gecos\0" Required_argument "g" -+ "shell\0" Required_argument "s" -+ "ingroup\0" Required_argument "G" -+ "disabled-password\0" No_argument "D" -+ "empty-password\0" No_argument "D" -+ "system\0" No_argument "S" -+ "no-create-home\0" No_argument "H" -+ ; -+#endif -+ - /* - * adduser will take a login_name as its first parameter. - * home, shell, gecos: -@@ -77,6 +90,10 @@ - struct passwd pw; - const char *usegroup = NULL; - FILE *file; -+ -+#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS -+ applet_long_options = adduser_longopts; -+#endif - - /* got root? */ - if (geteuid()) { diff --git a/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh b/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh deleted file mode 100755 index 9744322fa9..0000000000 --- a/meta/packages/busybox/busybox-1.9.1/busybox-mdev.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -MDEV=/sbin/mdev -DESC="Busybox mdev setup" - -# Complain if thing's aren't right -if [ ! -e /proc/filesystems ]; then - echo "mdev requires a mounted procfs, not started." - exit 1 -fi - -if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then - echo "mdev requires tmpfs support, not started." - exit 1 -fi - -if [ ! -d /sys/class/ ]; then - echo "mdev requires a mounted sysfs, not started." - exit 1 -fi - -if [ ! -e /proc/sys/kernel/hotplug ]; then - echo "mdev requires hotplug support, not started." - exit 1 -fi - -# We need to unmount /dev/pts/ and remount it later over the tmpfs -if mountpoint -q /dev/pts/; then - umount -l /dev/pts/ -fi - -if mountpoint -q /dev/shm/; then - umount -l /dev/shm/ -fi - -# Create tmpfs for /dev -echo "Creating tmpfs at /dev" -mount -t tmpfs tmpfs /dev -o size=800k - -# Register mdev as hotplug event helper -echo "$MDEV" > /proc/sys/kernel/hotplug - -# Populate /dev from /sys info -echo "Populating /dev using mdev" -$MDEV -s - -# Touch .udev to inform scripts that /dev needs no further setup -touch /dev/.udev - -# Mount devpts -TTYGRP=5 -TTYMODE=620 -mkdir -m 755 -p /dev/pts -if [ ! -e /dev/ptmx ]; then - mknod -m 666 /dev/ptmx c 5 2 -fi -mount -t devpts devpts /dev/pts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE - -# Make shm directory -mkdir -m 755 -p /dev/shm - -# Make extraneous links -ln -sf /proc/self/fd /dev/fd -ln -sf /proc/self/fd/0 /dev/stdin -ln -sf /proc/self/fd/1 /dev/stdout -ln -sf /proc/self/fd/2 /dev/stderr -ln -sf /proc/kcore /dev/core -ln -sf /proc/asound/oss/sndstat /dev/sndstat - -exit 0 diff --git a/meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch b/meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch deleted file mode 100644 index 55452a4524..0000000000 --- a/meta/packages/busybox/busybox-1.9.1/sort-z-nul.patch +++ /dev/null @@ -1,50 +0,0 @@ -Summary: 0001591: inconsistent behavior of sort -z - -URL: http://busybox.net/bugs/view.php?id=1591 -http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u - -Description: - -busybox sort -z does: -use NUL instead of EOL on input - -GNU sort -z does: -use NUL instead of EOL on input and output - -GNU sort -z documents: -use NUL instead of EOL on input - -Additional Information: - -Note that sort -z is not part of any standard. But several applications -(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior. - -GNU sort documentation bug was reported to coreutils maintainers. - -Notes: - -vda 02-13-08 06:30 (0004364) -Fixed in revision 21004. Thanks! - ---- busybox/coreutils/sort.c 2007/11/16 12:39:16 20435 -+++ busybox/coreutils/sort.c 2008/02/13 14:30:33 21004 -@@ -32,7 +32,7 @@ - FLAG_u = 8, /* Unique */ - FLAG_c = 0x10, /* Check: no output, exit(!ordered) */ - FLAG_s = 0x20, /* Stable sort, no ascii fallback at end */ -- FLAG_z = 0x40, /* Input is null terminated, not \n */ -+ FLAG_z = 0x40, /* Input and output is NUL terminated, not \n */ - /* These can be applied to search keys, the previous four can't */ - FLAG_b = 0x80, /* Ignore leading blanks */ - FLAG_r = 0x100, /* Reverse */ -@@ -396,8 +396,9 @@ - if (linecount) linecount = flag+1; - } - /* Print it */ -+ flag = (option_mask32 & FLAG_z) ? '\0' : '\n'; - for (i = 0; i < linecount; i++) -- fprintf(outfile, "%s\n", lines[i]); -+ fprintf(outfile, "%s%c", lines[i], flag); - - fflush_stdout_and_exit(EXIT_SUCCESS); - } diff --git a/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch b/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch deleted file mode 100644 index d00755fa3a..0000000000 --- a/meta/packages/busybox/busybox-1.9.1/udhcpscript.patch +++ /dev/null @@ -1,26 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: busybox-1.9.1/examples/udhcp/simple.script -=================================================================== ---- busybox-1.9.1.orig/examples/udhcp/simple.script 2008-02-12 16:03:13.000000000 +0000 -+++ busybox-1.9.1/examples/udhcp/simple.script 2009-05-27 22:54:42.000000000 +0100 -@@ -17,14 +17,13 @@ - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - - if [ -n "$router" ] ; then -- echo "deleting routers" -- while route del default gw 0.0.0.0 dev $interface ; do -+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do - : - done - - metric=0 - for i in $router ; do -- route add default gw $i dev $interface metric $((metric++)) -+ /sbin/route add default gw $i dev $interface metric $((metric++)) - done - fi - diff --git a/meta/packages/busybox/busybox.inc b/meta/packages/busybox/busybox.inc index 1419251b3d..93711cef00 100644 --- a/meta/packages/busybox/busybox.inc +++ b/meta/packages/busybox/busybox.inc @@ -31,6 +31,11 @@ INITSCRIPT_PARAMS_${PN}_slugos = "start 20 ." inherit cml1 update-rc.d +do_configure () { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + cml1_do_configure +} + do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS base_do_compile diff --git a/meta/packages/busybox/busybox_1.15.3.bb b/meta/packages/busybox/busybox_1.15.3.bb new file mode 100644 index 0000000000..25c2983e1e --- /dev/null +++ b/meta/packages/busybox/busybox_1.15.3.bb @@ -0,0 +1,37 @@ +require busybox.inc +PR = "1" + +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + file://udhcpscript.patch;patch=1 \ + file://udhcpc-fix-nfsroot.patch;patch=1 \ + file://B921600.patch;patch=1 \ + file://get_header_tar.patch;patch=1 \ + file://busybox-appletlib-dependency.patch;patch=1 \ + file://0000-wget-no-check-certificate.patch;patch=1 \ + file://run-parts.in.usr-bin.patch;patch=1 \ + file://find-touchscreen.sh \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script file://simple.script \ + file://hwclock.sh \ + file://mount.busybox \ + file://mountall \ + file://syslog \ + file://syslog.conf \ + file://umount.busybox \ + file://defconfig \ + file://mdev \ + file://mdev.conf \ +" + +EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" + +do_install_append() { + install -m 0644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/ + install -d ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/mdev + install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/ + install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/ +} diff --git a/meta/packages/busybox/busybox_1.9.1.bb b/meta/packages/busybox/busybox_1.9.1.bb deleted file mode 100644 index 26b73530f5..0000000000 --- a/meta/packages/busybox/busybox_1.9.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -require busybox.inc -PR = "r10" - -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \ - file://udhcpscript.patch;patch=1 \ - file://adduser-longops.patch;patch=1 \ - file://sort-z-nul.patch;patch=1;status=upstream \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script \ - file://hwclock.sh \ - file://mount.busybox \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig" - -EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" - -do_configure () { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config - cml1_do_configure -} - -# -# libbb/appletlib.c:38:27: error: applet_tables.h: No such file or directory -# -PARALLEL_MAKE = "" diff --git a/meta/packages/busybox/files/busybox-appletlib-dependency.patch b/meta/packages/busybox/files/busybox-appletlib-dependency.patch new file mode 100644 index 0000000000..3efd4c0882 --- /dev/null +++ b/meta/packages/busybox/files/busybox-appletlib-dependency.patch @@ -0,0 +1,15 @@ +Index: busybox-1.13.2/Makefile +=================================================================== +--- busybox-1.13.2.orig/Makefile 2009-03-19 15:44:37.419270265 +0300 ++++ busybox-1.13.2/Makefile 2009-03-19 15:45:57.737521296 +0300 +@@ -471,6 +471,10 @@ + util-linux/ \ + util-linux/volume_id/ \ + ++# Lib interdeps ++# libbb uses headers generated in applets ++libbb: applets ++ + endif # KBUILD_EXTMOD + + ifeq ($(dot-config),1) diff --git a/meta/packages/busybox/files/find-touchscreen.sh b/meta/packages/busybox/files/find-touchscreen.sh new file mode 100644 index 0000000000..1582ea891c --- /dev/null +++ b/meta/packages/busybox/files/find-touchscreen.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ `egrep "input:.*-e0.*,3,.*a0,1,.*18,.*" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then + ln -sf /dev/input/$MDEV /dev/input/touchscreen0 +fi + +if [ `egrep "ads7846" /sys/class/input/$MDEV/device/modalias|wc -l` -gt 0 ]; then + ln -sf /dev/input/$MDEV /dev/input/touchscreen0 +fi diff --git a/meta/packages/busybox/files/mdev b/meta/packages/busybox/files/mdev new file mode 100755 index 0000000000..4eed51e94c --- /dev/null +++ b/meta/packages/busybox/files/mdev @@ -0,0 +1,11 @@ +#!/bin/sh + +mount -t tmpfs tmpfs /dev -o size=64k,mode=0755 + +mkdir /dev/pts /dev/shm + +mount -t devpts devpts /dev/pts + +echo "/sbin/mdev" >/proc/sys/kernel/hotplug + +mdev -s diff --git a/meta/packages/busybox/files/mdev.conf b/meta/packages/busybox/files/mdev.conf new file mode 100644 index 0000000000..163ebfe45d --- /dev/null +++ b/meta/packages/busybox/files/mdev.conf @@ -0,0 +1,33 @@ +console 0:0 0600 +cpu_dma_latency 0:0 0660 +fb0:0 44 0660 +full 0:0 0666 +initctl 0:0 0600 +ircomm[0-9].* 0:20 0660 +kmem 0:15 0640 +kmsg 0:0 0660 +log 0:0 0666 +loop[0-9].* 0:6 0640 +mem 0:15 0640 +network_latency 0:0 0660 +network_throughput 0:0 0660 +null 0:0 0666 +port 0:15 0640 +ptmx 0:5 0666 +ram[0-9].* 0:6 0640 +random 0:0 0666 +sda 0:6 0640 +tty 0:5 0666 +tty.* 0:0 0620 +urandom 0:0 0666 +usbdev.* 0:0 0660 +vcs.* 0:5 0660 +zero 0:0 0666 + +pcm.* 0:0 0660 =snd/ +control.* 0:0 0660 =snd/ +timer 0:0 0660 =snd/ + +event.* 0:0 0660 =input/ @/etc/mdev/find-touchscreen.sh +mice 0:0 0660 =input/ +mouse.* 0:0 0660 =input/ diff --git a/meta/packages/busybox/files/mountall b/meta/packages/busybox/files/mountall new file mode 100644 index 0000000000..d5408b8f8d --- /dev/null +++ b/meta/packages/busybox/files/mountall @@ -0,0 +1 @@ +MOUNTALL="-t nonfs,nosmbfs,noncpfs" diff --git a/meta/packages/busybox/files/simple.script b/meta/packages/busybox/files/simple.script new file mode 100644 index 0000000000..5cc21b9de2 --- /dev/null +++ b/meta/packages/busybox/files/simple.script @@ -0,0 +1,72 @@ +#!/bin/sh + +# udhcpc script edited by Tim Riker <Tim@Rikers.org> + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +RESOLV_CONF="/etc/resolv.conf" +[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" +[ -n "$subnet" ] && NETMASK="netmask $subnet" + +# return 0 if root is mounted on a network filesystem +root_is_nfs() { + grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts +} + +have_bin_ip=0 +if [ -x /bin/ip ]; then + have_bin_ip=1 +fi + +case "$1" in + deconfig) + if ! root_is_nfs ; then + if [ $have_bin_ip -eq 1 ]; then + ip addr flush dev $interface + ip link set dev $interface up + else + /sbin/ifconfig $interface 0.0.0.0 + fi + fi + ;; + + renew|bound) + if [ $have_bin_ip -eq 1 ]; then + ip addr add dev $interface local $ip/$mask $BROADCAST + else + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + fi + + if [ -n "$router" ] ; then + if ! root_is_nfs ; then + if [ $have_bin_ip -eq 1 ]; then + while ip route del default 2>/dev/null ; do + : + done + else + while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + fi + fi + + metric=0 + for i in $router ; do + if [ $have_bin_ip -eq 1 ]; then + ip route add default via $i metric $((metric++)) + else + route add default gw $i dev $interface metric $((metric++)) 2>/dev/null + fi + done + fi + + echo -n > $RESOLV_CONF + [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF + for i in $dns ; do + echo adding dns $i + echo nameserver $i >> $RESOLV_CONF + done + ;; +esac + +exit 0 |