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

diff --git a/alpha/busy-config b/alpha/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/alpha/busy-config
+++ b/alpha/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/gen_compile.sh b/gen_compile.sh
index 894a0249f5c971fc1cf82af3bda721bf6a89de61..7a42ed8a5d25be7b65d26332188b576af5d0caff 100644 (file)
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -426,12 +426,6 @@ compile_busybox() {
                cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config"
                sed -i ${BUSYBOX_DIR}/.config -e 's/#\? \?CONFIG_FEATURE_INSTALLER[ =].*/CONFIG_FEATURE_INSTALLER=y/g'
                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...'
                yes '' 2>/dev/null | compile_generic oldconfig utils
                print_info 1 'busybox: >> Compiling...'

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

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 01c198b01fc11a4060de1201acd3146110ad36ef..bc83c69679dee69f767a4e8ee2db21240468c507 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -71,7 +71,7 @@ findcdmount() {
                        if [ -b "${x}" ]
                        then
                                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' ]
                                then
                                        # Check for a LiveCD
@@ -248,6 +248,14 @@ runUdev() {
        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() {
        error_string=$1
        error_string="${error_string:-run command}"
@@ -285,7 +293,7 @@ bind_mount_dev() {
 
 start_dev_mgr() {
        # 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
                USE_UDEV_NORMAL=1
        else
@@ -297,8 +305,9 @@ start_dev_mgr() {
                cd /sys
                [ "${DO_slowusb}" ] && sleep 10
                kill_devfsd
-               good_msg 'Activating udev'
-               runUdev
+               good_msg 'Activating mdev'
+#              runUdev
+               runmdev
                [ "${DO_slowusb}" ] && sleep 20
                cd /
        else

diff --git a/generic/linuxrc b/generic/linuxrc
index e58c1645a35dae025146ef2b27122afb09ec43ef..2fc586c0f3e6f48d9585c0c459faf007a52b0b89 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -382,12 +382,12 @@ do
        else
                good_msg "Mounting root..."
 
-               # Try to mount the device as  ${NEW_ROOT}
+               # Try to mount the device as ${NEW_ROOT}
                if [ "${REAL_ROOT}" = '/dev/nfs' ]; then
                        findnfsmount
                else
                        # mount ro so fsck doesn't barf later
-                       mount -o ro ${REAL_ROOT}  ${NEW_ROOT}
+                       mount -o ro ${REAL_ROOT} ${NEW_ROOT}
                fi
                
                # If mount is successful break out of the loop 
@@ -611,8 +611,6 @@ else
        then
                union_insert_dir ${UNION} ${NEW_ROOT}
                mkdir -p ${UNION}/tmp/.initrd
-       else
-               mkdir -p ${NEW_ROOT}/tmp/.initrd
        fi
 fi
 
@@ -637,7 +635,6 @@ then
        mount -o move /memory /${CHROOT}/.unions/memory || echo '*: Failed to move unionfs /memory into the system root!'
 fi
 
-
 if [ "$0" = '/linuxrc' ]
 then
        [ ! -e ${CHROOT}/dev/console ] && mknod ${CHROOT}/dev/console c 5 1
@@ -690,12 +687,11 @@ elif [ "$0" = '/init' ]
 then
           [ ! -e /${CHROOT}/dev/console ] && mknod /${CHROOT}/dev/console c 5 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}
           mkdir /${CHROOT}/proc /${CHROOT}/sys 2>/dev/null
           echo -n '.'
-                          umount /dev || echo '*: Failed to unmount the initrd /dev!'
                           umount /sys || echo '*: Failed to unmount the initrd /sys!'
                           umount /proc || echo '*: Failed to unmount the initrd /proc!'
           echo -n '.'
@@ -705,9 +701,8 @@ then
 
           # Cleanup initramfs in the background
           # to reclaim initramfs tmpfs memoryspace
-          
-          
-          INITRAMFS_FILES=`ls /`
+
+          INITRAMFS_FILES=`ls / | sed -e 's|dev||'`
           INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${CHROOT#/}||g"`
           
           if [ -n "${MEMORY}" ]
@@ -717,21 +712,19 @@ then
           
           if [ -n "${UNION}" ]
           then
-          INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${UNION#/}||g"`
+               INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${UNION#/}||g"`
           fi
-          
           INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|newroot||g"`
+
           for i in ${INITRAMFS_FILES}
           do
-               for j in `/bin/busybox find /$i 2>/dev/null`
+               for j in `/bin/busybox find /$i 2> /dev/null`
                do
                        if /bin/busybox [ ! -d "$j" -a "$j" != "/bin/busybox" ]
                        then
                                /bin/busybox rm "$j"
                        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" ]
                        then
                                /bin/busybox rm -r "$j"
@@ -741,7 +734,7 @@ then
           # End initramfs cleanup
 
           # 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 /sbin/init ${REAL_INIT}
 EOF

diff --git a/genkernel b/genkernel
index 05112ebeb1e5406911f843a41fc0cf547ddb999e..c37770fa0114f1489181533f0b0b02dc2b7fdd45 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -302,7 +302,8 @@ then
 
        if [ "${KERN_24}" != '1' -a "${UDEV}" -eq '1' ] 
        then
-               compile_udev 
+               :
+#              compile_udev 
        else
                DEVFS=1
                UDEV=0

diff --git a/genkernel.conf b/genkernel.conf
index 8fc3e9271f6548e058a2f9946ba91ea90d1b04ad..d3a236cdc5236f69219965527a64e702701b8fd9 100755 (executable)
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -66,7 +66,7 @@ DEFAULT_KERNEL_SOURCE="/usr/src/linux"
 # Configuration file for busybox
 BUSYBOX_CONFIG="${GK_SHARE}/%%ARCH%%/busy-config"
 # 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
 # binary is just a bzip2 busybox executable
 BUSYBOX_BINCACHE="%%CACHE%%/busybox-${BUSYBOX_VER}-%%ARCH%%.bz2"

diff --git a/ia64/busy-config b/ia64/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/ia64/busy-config
+++ b/ia64/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/mips/busy-config b/mips/busy-config
index 6bbc7e3ef7fa8356d4120a7262cfee9ca7304566..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/mips/busy-config
+++ b/mips/busy-config
@@ -15,8 +15,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_DEVFS is not set
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID is not set
 # CONFIG_SELINUX is not set
 
 #
@@ -25,7 +24,7 @@ CONFIG_FEATURE_SUID=y
 CONFIG_STATIC=y
 # CONFIG_LFS 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
@@ -49,20 +48,14 @@ CONFIG_GZIP=y
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 # 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_COMPRESS is not set
 CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=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_UNZIP is not set
 
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-
 #
 # Coreutils
 #
@@ -87,7 +80,6 @@ CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
 CONFIG_ECHO=y
 CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_ENV=y
-# CONFIG_PRINTENV is not set
 # CONFIG_EXPR is not set
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
@@ -95,7 +87,6 @@ CONFIG_HEAD=y
 # CONFIG_FEATURE_FANCY_HEAD is not set
 # CONFIG_HOSTID is not set
 CONFIG_ID=y
-# CONFIG_INSTALL is not set
 # CONFIG_LENGTH is not set
 CONFIG_LN=y
 # CONFIG_LOGNAME is not set
@@ -112,20 +103,19 @@ CONFIG_MKDIR=y
 # CONFIG_MKFIFO is not set
 CONFIG_MKNOD=y
 CONFIG_MV=y
-# CONFIG_NICE is not set
 # CONFIG_OD is not set
 # CONFIG_PRINTF is not set
 CONFIG_PWD=y
 # CONFIG_REALPATH is not set
 CONFIG_RM=y
 CONFIG_RMDIR=y
-# CONFIG_SEQ is not set
 # CONFIG_SHA1SUM is not set
 CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
 CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_REVERSE is not set
+# CONFIG_FEATURE_SORT_UNIQUE is not set
 # CONFIG_STTY is not set
-# CONFIG_SUM is not set
 CONFIG_SYNC=y
 CONFIG_TAIL=y
 # CONFIG_FEATURE_FANCY_TAIL is not set
@@ -135,7 +125,6 @@ CONFIG_TEST=y
 #
 # test (forced enabled for use with shell)
 #
-# CONFIG_FEATURE_TEST_64 is not set
 CONFIG_TOUCH=y
 # CONFIG_TR is not set
 CONFIG_TRUE=y
@@ -173,6 +162,7 @@ CONFIG_CHVT=y
 CONFIG_CLEAR=y
 # CONFIG_DEALLOCVT is not set
 CONFIG_DUMPKMAP=y
+# CONFIG_LOADACM is not set
 CONFIG_LOADFONT=y
 CONFIG_LOADKMAP=y
 # CONFIG_OPENVT is not set
@@ -183,25 +173,18 @@ CONFIG_RESET=y
 # Debian Utilities
 #
 CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
 CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
 # CONFIG_RUN_PARTS is not set
 # CONFIG_START_STOP_DAEMON is not set
 CONFIG_WHICH=y
 
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_LSATTR is not set
-
 #
 # Editors
 #
 # CONFIG_AWK is not set
 # CONFIG_PATCH is not set
 CONFIG_SED=y
+# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
 # CONFIG_VI is not set
 
 #
@@ -219,10 +202,6 @@ CONFIG_GREP=y
 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
 # CONFIG_FEATURE_GREP_CONTEXT is not set
 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
@@ -231,7 +210,6 @@ CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_INITRD=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
-CONFIG_FEATURE_INIT_SWAPON=y
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
@@ -260,12 +238,10 @@ CONFIG_MESG=y
 # CONFIG_CROND is not set
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
-# CONFIG_DEVFSD is not set
 # CONFIG_LAST is not set
 # CONFIG_HDPARM is not set
 # CONFIG_MAKEDEVS is not set
 # CONFIG_MT is not set
-# CONFIG_RX is not set
 # CONFIG_STRINGS is not set
 # CONFIG_TIME is not set
 # CONFIG_WATCHDOG is not set
@@ -273,10 +249,22 @@ CONFIG_MESG=y
 #
 # Linux Module Utilities
 #
-# CONFIG_INSMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_RMMOD is not set
+CONFIG_INSMOD=n
+# CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
+CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
+
+#
+#   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
@@ -326,7 +314,6 @@ CONFIG_PS=y
 # CONFIG_RENICE is not set
 # CONFIG_TOP is not set
 CONFIG_UPTIME=y
-# CONFIG_SYSCTL is not set
 
 #
 # Another Bourne-like Shell
@@ -341,15 +328,14 @@ CONFIG_ASH=y
 #
 # Ash Shell Options
 #
+CONFIG_ASH_TIMEOUT=y
 CONFIG_ASH_JOB_CONTROL=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_CMDCMD is not set
 CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
@@ -357,14 +343,14 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 #
 # 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_HISTORY=15
 # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
 CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
 # 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_EXTRA_QUIET is not set
 
 #
 # System Logging Utilities
@@ -387,6 +373,8 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y

diff --git a/parisc/busy-config b/parisc/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/parisc/busy-config
+++ b/parisc/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/parisc64/busy-config b/parisc64/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/parisc64/busy-config
+++ b/parisc64/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/pkg/busybox-1.00-headers_fix.patch b/pkg/busybox-1.00-headers_fix.patch
deleted file mode 100644 (file)
index 7e7e37b..0000000
--- a/pkg/busybox-1.00-headers_fix.patch
+++ /dev/null
@@ -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

diff --git a/pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2 b/pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2
deleted file mode 100644 (file)
index 68b64d4..0000000
Binary files a/pkg/busybox-1.00-rt-mdstart.plasmaroo.tar.bz2 and /dev/null differ

diff --git a/pkg/busybox-1.1.0-gentoo-gk4-20060519-snappie.tar.bz2 b/pkg/busybox-1.1.0-gentoo-gk4-20060519-snappie.tar.bz2
new file mode 100644 (file)
index 0000000..df2e32a
Binary files /dev/null and b/pkg/busybox-1.1.0-gentoo-gk4-20060519-snappie.tar.bz2 differ

diff --git a/ppc/busy-config b/ppc/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/ppc/busy-config
+++ b/ppc/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/ppc64/busy-config b/ppc64/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/ppc64/busy-config
+++ b/ppc64/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/sparc/busy-config b/sparc/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/sparc/busy-config
+++ b/sparc/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/sparc64/busy-config b/sparc64/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/sparc64/busy-config
+++ b/sparc64/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/um/busy-config b/um/busy-config
index dd6b333777c1980d46e3fb7046857405c74d771d..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/um/busy-config
+++ b/um/busy-config
@@ -12,7 +12,7 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_INSTALLER 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_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/x86/busy-config b/x86/busy-config
index 4bd7560e232e2b9db6895f2c3be0c42a5d109348..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/x86/busy-config
+++ b/x86/busy-config
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/x86_64/busy-config b/x86_64/busy-config
index 4bd7560e232e2b9db6895f2c3be0c42a5d109348..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/x86_64/busy-config
+++ b/x86_64/busy-config
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/xen0/busy-config b/xen0/busy-config
index 4bd7560e232e2b9db6895f2c3be0c42a5d109348..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/xen0/busy-config
+++ b/xen0/busy-config
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y

diff --git a/xenU/busy-config b/xenU/busy-config
index 4bd7560e232e2b9db6895f2c3be0c42a5d109348..0d683ff3ffa05060574f60c3e306a97647b60ad8 100644 (file)
--- a/xenU/busy-config
+++ b/xenU/busy-config
@@ -373,6 +373,7 @@ CONFIG_FREERAMDISK=y
 # CONFIG_HEXDUMP is not set
 # CONFIG_HWCLOCK is not set
 CONFIG_LOSETUP=y
+CONFIG_MDEV=y
 CONFIG_MDSTART=y
 # CONFIG_MKSWAP is not set
 CONFIG_MORE=y