Update to busybox 1.1.0; port over to use mdev.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@388 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Tim Yamin 19 years ago
parent e5da5c9721
commit fd9747ca4f

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -426,12 +426,6 @@ compile_busybox() {
cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config" cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config"
sed -i ${BUSYBOX_DIR}/.config -e 's/#\? \?CONFIG_FEATURE_INSTALLER[ =].*/CONFIG_FEATURE_INSTALLER=y/g' sed -i ${BUSYBOX_DIR}/.config -e 's/#\? \?CONFIG_FEATURE_INSTALLER[ =].*/CONFIG_FEATURE_INSTALLER=y/g'
cd "${BUSYBOX_DIR}" cd "${BUSYBOX_DIR}"
if [ -f ${GK_SHARE}/pkg/busybox-1.00-headers_fix.patch ]
then
patch -p1 -i \
${GK_SHARE}/pkg/busybox-1.00-headers_fix.patch \
|| gen_die "Failed patching busybox"
fi
print_info 1 'busybox: >> Configuring...' print_info 1 'busybox: >> Configuring...'
yes '' 2>/dev/null | compile_generic oldconfig utils yes '' 2>/dev/null | compile_generic oldconfig utils
print_info 1 'busybox: >> Compiling...' print_info 1 'busybox: >> Compiling...'

@ -463,10 +463,10 @@ merge_initramfs_cpio_archives(){
MERGE_LIST="${MERGE_LIST} initramfs-insmod-${MODULE_INIT_TOOLS_VER}.cpio.gz" MERGE_LIST="${MERGE_LIST} initramfs-insmod-${MODULE_INIT_TOOLS_VER}.cpio.gz"
fi fi
if [ "${UDEV}" -eq '1' -a -e ${CACHE_CPIO_DIR}/initramfs-udev-${UDEV_VER}.cpio.gz ] # if [ "${UDEV}" -eq '1' -a -e ${CACHE_CPIO_DIR}/initramfs-udev-${UDEV_VER}.cpio.gz ]
then # then
MERGE_LIST="${MERGE_LIST} initramfs-udev-${UDEV_VER}.cpio.gz" # MERGE_LIST="${MERGE_LIST} initramfs-udev-${UDEV_VER}.cpio.gz"
fi # fi
if [ "${DISKLABEL}" -eq '1' -a -e ${CACHE_CPIO_DIR}/initramfs-blkid-${E2FSPROGS_VER}.cpio.gz ] if [ "${DISKLABEL}" -eq '1' -a -e ${CACHE_CPIO_DIR}/initramfs-blkid-${E2FSPROGS_VER}.cpio.gz ]
then then
MERGE_LIST="${MERGE_LIST} initramfs-blkid-${E2FSPROGS_VER}.cpio.gz" MERGE_LIST="${MERGE_LIST} initramfs-blkid-${E2FSPROGS_VER}.cpio.gz"
@ -572,11 +572,11 @@ create_initramfs() {
create_devfs_cpio create_devfs_cpio
fi fi
if [ "${UDEV}" -eq '1' ] # if [ "${UDEV}" -eq '1' ]
then # then
print_info 1 " >> Creating udev cpio archive..." # print_info 1 " >> Creating udev cpio archive..."
create_udev_cpio # create_udev_cpio
fi # fi
if [ "${UNIONFS}" -eq '1' ] if [ "${UNIONFS}" -eq '1' ]
then then

@ -71,7 +71,7 @@ findcdmount() {
if [ -b "${x}" ] if [ -b "${x}" ]
then then
good_msg "Attempting to mount CD:- ${x}" good_msg "Attempting to mount CD:- ${x}"
mount -r ${x} ${NEW_ROOT}/mnt/cdrom > /dev/null 2>&1 mount -r -t iso9660 ${x} ${NEW_ROOT}/mnt/cdrom > /dev/null 2>&1
if [ "$?" = '0' ] if [ "$?" = '0' ]
then then
# Check for a LiveCD # Check for a LiveCD
@ -248,6 +248,14 @@ runUdev() {
ln -snf /proc/kcore /dev/core ln -snf /proc/kcore /dev/core
} }
runmdev() {
# busybox udev replacement
mdev -s
# catch udev hotplug events
echo /sbin/mdev > /proc/sys/kernel/hotplug
}
test_success() { test_success() {
error_string=$1 error_string=$1
error_string="${error_string:-run command}" error_string="${error_string:-run command}"
@ -285,7 +293,7 @@ bind_mount_dev() {
start_dev_mgr() { start_dev_mgr() {
# Check udev is available... # Check udev is available...
if [ "${KV_2_6_OR_GREATER}" -a ! "${USE_UDEV_NORMAL}" -eq '0' -a -x /sbin/udevtrigger ] if [ "${KV_2_6_OR_GREATER}" -a ! "${USE_UDEV_NORMAL}" -eq '0' ]
then then
USE_UDEV_NORMAL=1 USE_UDEV_NORMAL=1
else else
@ -297,8 +305,9 @@ start_dev_mgr() {
cd /sys cd /sys
[ "${DO_slowusb}" ] && sleep 10 [ "${DO_slowusb}" ] && sleep 10
kill_devfsd kill_devfsd
good_msg 'Activating udev' good_msg 'Activating mdev'
runUdev # runUdev
runmdev
[ "${DO_slowusb}" ] && sleep 20 [ "${DO_slowusb}" ] && sleep 20
cd / cd /
else else

@ -611,8 +611,6 @@ else
then then
union_insert_dir ${UNION} ${NEW_ROOT} union_insert_dir ${UNION} ${NEW_ROOT}
mkdir -p ${UNION}/tmp/.initrd mkdir -p ${UNION}/tmp/.initrd
else
mkdir -p ${NEW_ROOT}/tmp/.initrd
fi fi
fi fi
@ -637,7 +635,6 @@ then
mount -o move /memory /${CHROOT}/.unions/memory || echo '*: Failed to move unionfs /memory into the system root!' mount -o move /memory /${CHROOT}/.unions/memory || echo '*: Failed to move unionfs /memory into the system root!'
fi fi
if [ "$0" = '/linuxrc' ] if [ "$0" = '/linuxrc' ]
then then
[ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1 [ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1
@ -690,12 +687,11 @@ elif [ "$0" = '/init' ]
then then
[ ! -e /${CHROOT}/dev/console ] && mknod /${CHROOT}/dev/console c 5 1 [ ! -e /${CHROOT}/dev/console ] && mknod /${CHROOT}/dev/console c 5 1
[ ! -e /${CHROOT}/dev/tty1 ] && mknod /${CHROOT}/dev/tty1 c 4 1 [ ! -e /${CHROOT}/dev/tty1 ] && mknod /${CHROOT}/dev/tty1 c 4 1
echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)..." echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)"
cd ${CHROOT} cd ${CHROOT}
mkdir /${CHROOT}/proc /${CHROOT}/sys 2>/dev/null mkdir /${CHROOT}/proc /${CHROOT}/sys 2>/dev/null
echo -n '.' echo -n '.'
umount /dev || echo '*: Failed to unmount the initrd /dev!'
umount /sys || echo '*: Failed to unmount the initrd /sys!' umount /sys || echo '*: Failed to unmount the initrd /sys!'
umount /proc || echo '*: Failed to unmount the initrd /proc!' umount /proc || echo '*: Failed to unmount the initrd /proc!'
echo -n '.' echo -n '.'
@ -706,8 +702,7 @@ then
# Cleanup initramfs in the background # Cleanup initramfs in the background
# to reclaim initramfs tmpfs memoryspace # to reclaim initramfs tmpfs memoryspace
INITRAMFS_FILES=`ls / | sed -e 's|dev||'`
INITRAMFS_FILES=`ls /`
INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${CHROOT#/}||g"` INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${CHROOT#/}||g"`
if [ -n "${MEMORY}" ] if [ -n "${MEMORY}" ]
@ -719,19 +714,17 @@ then
then then
INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${UNION#/}||g"` INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${UNION#/}||g"`
fi fi
INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|newroot||g"` INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|newroot||g"`
for i in ${INITRAMFS_FILES} for i in ${INITRAMFS_FILES}
do do
for j in `/bin/busybox find /$i 2>/dev/null` for j in `/bin/busybox find /$i 2> /dev/null`
do do
if /bin/busybox [ ! -d "$j" -a "$j" != "/bin/busybox" ] if /bin/busybox [ ! -d "$j" -a "$j" != "/bin/busybox" ]
then then
/bin/busybox rm "$j" /bin/busybox rm "$j"
fi fi
done
for j in `/bin/busybox find /$i 2>/dev/null`
do
if /bin/busybox [ -d "${j}" -a "${j}" != "/bin" -a "${j}" != "/dev" -a "${j}" != "/sys" ] if /bin/busybox [ -d "${j}" -a "${j}" != "/bin" -a "${j}" != "/dev" -a "${j}" != "/sys" ]
then then
/bin/busybox rm -r "$j" /bin/busybox rm -r "$j"
@ -741,7 +734,7 @@ then
# End initramfs cleanup # End initramfs cleanup
# Start the real root init # Start the real root init
(/bin/busybox sleep 3; /bin/busybox rm /dev -r; /bin/busybox rm /bin/busybox) & (/bin/busybox sleep 3; /bin/busybox rm -r /bin/busybox /dev) &
exec /bin/busybox chroot . /bin/sh <<- EOF exec /bin/busybox chroot . /bin/sh <<- EOF
exec /sbin/init ${REAL_INIT} exec /sbin/init ${REAL_INIT}
EOF EOF

@ -302,7 +302,8 @@ then
if [ "${KERN_24}" != '1' -a "${UDEV}" -eq '1' ] if [ "${KERN_24}" != '1' -a "${UDEV}" -eq '1' ]
then then
compile_udev :
# compile_udev
else else
DEVFS=1 DEVFS=1
UDEV=0 UDEV=0

@ -66,7 +66,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
# Configuration file for busybox # Configuration file for busybox
BUSYBOX_CONFIG="${GK_SHARE}/%%ARCH%%/busy-config" BUSYBOX_CONFIG="${GK_SHARE}/%%ARCH%%/busy-config"
# BusyBox Version # BusyBox Version
BUSYBOX_VER="1.00-rt-mdstart.plasmaroo" BUSYBOX_VER="1.1.0-gentoo-gk4-20060519-snappie"
# Busybox bin-cache location, to store pre-compiled busybox # Busybox bin-cache location, to store pre-compiled busybox
# binary is just a bzip2 busybox executable # binary is just a bzip2 busybox executable
BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.bz2" BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.bz2"

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -15,8 +15,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_DEVFS is not set # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID is not set
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_SELINUX is not set # CONFIG_SELINUX is not set
# #
@ -25,7 +24,7 @@ CONFIG_FEATURE_SUID=y
CONFIG_STATIC=y CONFIG_STATIC=y
# CONFIG_LFS is not set # CONFIG_LFS is not set
# USING_CROSS_COMPILER is not set # USING_CROSS_COMPILER is not set
EXTRA_CFLAGS_OPTIONS="-march=mips3 -ftracer -pipe -fomit-frame-pointer -fforce-addr" EXTRA_CFLAGS_OPTIONS=""
# #
# Installation Options # Installation Options
@ -49,20 +48,14 @@ CONFIG_GZIP=y
CONFIG_TAR=y CONFIG_TAR=y
CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_CREATE=y
# CONFIG_FEATURE_TAR_BZIP2 is not set # CONFIG_FEATURE_TAR_BZIP2 is not set
# CONFIG_FEATURE_TAR_FROM is not set # CONFIG_FEATURE_TAR_EXCLUDE is not set
CONFIG_FEATURE_TAR_GZIP=y CONFIG_FEATURE_TAR_GZIP=y
# CONFIG_FEATURE_TAR_COMPRESS is not set
CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_FEATURE_UNARCHIVE_TAPE is not set
# CONFIG_UNCOMPRESS is not set # CONFIG_UNCOMPRESS is not set
# CONFIG_UNZIP is not set # CONFIG_UNZIP is not set
#
# Common options for cpio and tar
#
# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
# #
# Coreutils # Coreutils
# #
@ -87,7 +80,6 @@ CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
CONFIG_ECHO=y CONFIG_ECHO=y
CONFIG_FEATURE_FANCY_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y
CONFIG_ENV=y CONFIG_ENV=y
# CONFIG_PRINTENV is not set
# CONFIG_EXPR is not set # CONFIG_EXPR is not set
CONFIG_FALSE=y CONFIG_FALSE=y
# CONFIG_FOLD is not set # CONFIG_FOLD is not set
@ -95,7 +87,6 @@ CONFIG_HEAD=y
# CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_FEATURE_FANCY_HEAD is not set
# CONFIG_HOSTID is not set # CONFIG_HOSTID is not set
CONFIG_ID=y CONFIG_ID=y
# CONFIG_INSTALL is not set
# CONFIG_LENGTH is not set # CONFIG_LENGTH is not set
CONFIG_LN=y CONFIG_LN=y
# CONFIG_LOGNAME is not set # CONFIG_LOGNAME is not set
@ -112,20 +103,19 @@ CONFIG_MKDIR=y
# CONFIG_MKFIFO is not set # CONFIG_MKFIFO is not set
CONFIG_MKNOD=y CONFIG_MKNOD=y
CONFIG_MV=y CONFIG_MV=y
# CONFIG_NICE is not set
# CONFIG_OD is not set # CONFIG_OD is not set
# CONFIG_PRINTF is not set # CONFIG_PRINTF is not set
CONFIG_PWD=y CONFIG_PWD=y
# CONFIG_REALPATH is not set # CONFIG_REALPATH is not set
CONFIG_RM=y CONFIG_RM=y
CONFIG_RMDIR=y CONFIG_RMDIR=y
# CONFIG_SEQ is not set
# CONFIG_SHA1SUM is not set # CONFIG_SHA1SUM is not set
CONFIG_SLEEP=y CONFIG_SLEEP=y
# CONFIG_FEATURE_FANCY_SLEEP is not set # CONFIG_FEATURE_FANCY_SLEEP is not set
CONFIG_SORT=y CONFIG_SORT=y
# CONFIG_FEATURE_SORT_REVERSE is not set
# CONFIG_FEATURE_SORT_UNIQUE is not set
# CONFIG_STTY is not set # CONFIG_STTY is not set
# CONFIG_SUM is not set
CONFIG_SYNC=y CONFIG_SYNC=y
CONFIG_TAIL=y CONFIG_TAIL=y
# CONFIG_FEATURE_FANCY_TAIL is not set # CONFIG_FEATURE_FANCY_TAIL is not set
@ -135,7 +125,6 @@ CONFIG_TEST=y
# #
# test (forced enabled for use with shell) # test (forced enabled for use with shell)
# #
# CONFIG_FEATURE_TEST_64 is not set
CONFIG_TOUCH=y CONFIG_TOUCH=y
# CONFIG_TR is not set # CONFIG_TR is not set
CONFIG_TRUE=y CONFIG_TRUE=y
@ -173,6 +162,7 @@ CONFIG_CHVT=y
CONFIG_CLEAR=y CONFIG_CLEAR=y
# CONFIG_DEALLOCVT is not set # CONFIG_DEALLOCVT is not set
CONFIG_DUMPKMAP=y CONFIG_DUMPKMAP=y
# CONFIG_LOADACM is not set
CONFIG_LOADFONT=y CONFIG_LOADFONT=y
CONFIG_LOADKMAP=y CONFIG_LOADKMAP=y
# CONFIG_OPENVT is not set # CONFIG_OPENVT is not set
@ -183,25 +173,18 @@ CONFIG_RESET=y
# Debian Utilities # Debian Utilities
# #
CONFIG_MKTEMP=y CONFIG_MKTEMP=y
# CONFIG_PIPE_PROGRESS is not set
CONFIG_READLINK=y CONFIG_READLINK=y
# CONFIG_FEATURE_READLINK_FOLLOW is not set
# CONFIG_RUN_PARTS is not set # CONFIG_RUN_PARTS is not set
# CONFIG_START_STOP_DAEMON is not set # CONFIG_START_STOP_DAEMON is not set
CONFIG_WHICH=y CONFIG_WHICH=y
#
# Linux Ext2 FS Progs
#
# CONFIG_CHATTR is not set
# CONFIG_LSATTR is not set
# #
# Editors # Editors
# #
# CONFIG_AWK is not set # CONFIG_AWK is not set
# CONFIG_PATCH is not set # CONFIG_PATCH is not set
CONFIG_SED=y CONFIG_SED=y
# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
# CONFIG_VI is not set # CONFIG_VI is not set
# #
@ -219,10 +202,6 @@ CONFIG_GREP=y
CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y
# CONFIG_FEATURE_GREP_CONTEXT is not set # CONFIG_FEATURE_GREP_CONTEXT is not set
CONFIG_XARGS=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
# #
# Init Utilities # Init Utilities
@ -231,7 +210,6 @@ CONFIG_INIT=y
CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_USE_INITTAB=y
CONFIG_FEATURE_INITRD=y CONFIG_FEATURE_INITRD=y
# CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set
CONFIG_FEATURE_INIT_SWAPON=y
# CONFIG_FEATURE_EXTRA_QUIET is not set # CONFIG_FEATURE_EXTRA_QUIET is not set
CONFIG_HALT=y CONFIG_HALT=y
CONFIG_POWEROFF=y CONFIG_POWEROFF=y
@ -260,12 +238,10 @@ CONFIG_MESG=y
# CONFIG_CROND is not set # CONFIG_CROND is not set
# CONFIG_CRONTAB is not set # CONFIG_CRONTAB is not set
# CONFIG_DC is not set # CONFIG_DC is not set
# CONFIG_DEVFSD is not set
# CONFIG_LAST is not set # CONFIG_LAST is not set
# CONFIG_HDPARM is not set # CONFIG_HDPARM is not set
# CONFIG_MAKEDEVS is not set # CONFIG_MAKEDEVS is not set
# CONFIG_MT is not set # CONFIG_MT is not set
# CONFIG_RX is not set
# CONFIG_STRINGS is not set # CONFIG_STRINGS is not set
# CONFIG_TIME is not set # CONFIG_TIME is not set
# CONFIG_WATCHDOG is not set # CONFIG_WATCHDOG is not set
@ -273,10 +249,22 @@ CONFIG_MESG=y
# #
# Linux Module Utilities # Linux Module Utilities
# #
# CONFIG_INSMOD is not set CONFIG_INSMOD=n
# CONFIG_LSMOD is not set # CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
# CONFIG_MODPROBE is not set CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
# CONFIG_RMMOD is not set
#
# Support new (post 2.1) Linux kernels (Forced enabled)
#
# 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_LSMOD=y
CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
CONFIG_MODPROBE=y
CONFIG_RMMOD=y
CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
# #
# Networking Utilities # Networking Utilities
@ -326,7 +314,6 @@ CONFIG_PS=y
# CONFIG_RENICE is not set # CONFIG_RENICE is not set
# CONFIG_TOP is not set # CONFIG_TOP is not set
CONFIG_UPTIME=y CONFIG_UPTIME=y
# CONFIG_SYSCTL is not set
# #
# Another Bourne-like Shell # Another Bourne-like Shell
@ -341,15 +328,14 @@ CONFIG_ASH=y
# #
# Ash Shell Options # Ash Shell Options
# #
CONFIG_ASH_TIMEOUT=y
CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_JOB_CONTROL=y
CONFIG_ASH_ALIAS=y CONFIG_ASH_ALIAS=y
CONFIG_ASH_MATH_SUPPORT=y CONFIG_ASH_MATH_SUPPORT=y
# CONFIG_ASH_MATH_SUPPORT_64 is not set
# CONFIG_ASH_GETOPTS is not set # CONFIG_ASH_GETOPTS is not set
# CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_CMDCMD is not set
CONFIG_ASH_MAIL=y CONFIG_ASH_MAIL=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
# CONFIG_ASH_RANDOM_SUPPORT is not set
# CONFIG_HUSH is not set # CONFIG_HUSH is not set
# CONFIG_LASH is not set # CONFIG_LASH is not set
# CONFIG_MSH is not set # CONFIG_MSH is not set
@ -357,14 +343,14 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
# #
# Bourne Shell Options # Bourne Shell Options
# #
# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
CONFIG_FEATURE_COMMAND_EDITING=y CONFIG_FEATURE_COMMAND_EDITING=y
CONFIG_FEATURE_COMMAND_HISTORY=15
# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
CONFIG_FEATURE_COMMAND_HISTORY=15
# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
CONFIG_FEATURE_SH_FANCY_PROMPT=y CONFIG_FEATURE_SH_FANCY_PROMPT=y
# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
# #
# System Logging Utilities # System Logging Utilities
@ -387,6 +373,8 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y CONFIG_FEATURE_USE_TERMIOS=y

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -1,36 +0,0 @@
diff -ur busybox-1.00-rt-mdstart.plasmaroo/coreutils/Config.in busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Config.in
--- busybox-1.00-rt-mdstart.plasmaroo/coreutils/Config.in 2004-08-11 03:45:47.000000000 +0100
+++ busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Config.in 2006-01-11 23:35:23.000000000 +0000
@@ -469,7 +469,7 @@
touch is used to create or change the access and/or
modification timestamp of specified files.
-config CONFIG_TR
+config CONFIG_TR_X
bool "tr"
default n
help
diff -ur busybox-1.00-rt-mdstart.plasmaroo/coreutils/Makefile.in busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Makefile.in
--- busybox-1.00-rt-mdstart.plasmaroo/coreutils/Makefile.in 2004-10-08 08:45:14.000000000 +0100
+++ busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Makefile.in 2006-01-11 23:35:32.000000000 +0000
@@ -74,7 +74,7 @@
COREUTILS-$(CONFIG_TEE) += tee.o
COREUTILS-$(CONFIG_TEST) += test.o
COREUTILS-$(CONFIG_TOUCH) += touch.o
-COREUTILS-$(CONFIG_TR) += tr.o
+COREUTILS-$(CONFIG_TR_X) += tr.o
COREUTILS-$(CONFIG_TRUE) += true.o
COREUTILS-$(CONFIG_TTY) += tty.o
COREUTILS-$(CONFIG_UNAME) += uname.o
diff -ur busybox-1.00-rt-mdstart.plasmaroo/include/applets.h busybox-1.00-rt-mdstart.plasmaroo.new/include/applets.h
--- busybox-1.00-rt-mdstart.plasmaroo/include/applets.h 2006-01-11 23:29:22.000000000 +0000
+++ busybox-1.00-rt-mdstart.plasmaroo.new/include/applets.h 2006-01-11 23:35:30.000000000 +0000
@@ -586,7 +586,7 @@
#ifdef CONFIG_TOUCH
APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif
-#ifdef CONFIG_TR
+#ifdef CONFIG_TR_X
APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
#endif
#ifdef CONFIG_TRACEROUTE

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
# CONFIG_FEATURE_VERBOSE_USAGE is not set # CONFIG_FEATURE_VERBOSE_USAGE is not set
# CONFIG_FEATURE_INSTALLER is not set # CONFIG_FEATURE_INSTALLER is not set
# CONFIG_LOCALE_SUPPORT is not set # CONFIG_LOCALE_SUPPORT is not set
CONFIG_FEATURE_DEVFS=y # CONFIG_FEATURE_DEVFS is not set
CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_DEVPTS=y
# CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_CLEAN_UP is not set
# CONFIG_FEATURE_SUID is not set # CONFIG_FEATURE_SUID is not set
@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
# CONFIG_HEXDUMP is not set # CONFIG_HEXDUMP is not set
# CONFIG_HWCLOCK is not set # CONFIG_HWCLOCK is not set
CONFIG_LOSETUP=y CONFIG_LOSETUP=y
CONFIG_MDEV=y
CONFIG_MDSTART=y CONFIG_MDSTART=y
# CONFIG_MKSWAP is not set # CONFIG_MKSWAP is not set
CONFIG_MORE=y CONFIG_MORE=y

Loading…
Cancel
Save