- updated

Changed files:
    busybox-LFS.patch -> 1.6
    busybox-initrd.config -> 1.22
    busybox-pivot_root.patch -> 1.4
    busybox.config -> 1.13

diff --git a/busybox-LFS.patch b/busybox-LFS.patch
index eaa51f397e751b866e384c6a58ac30a5a2cae950..3d59ab556ea4606c32b0b858dc36db2afd689c96 100644 (file)
--- a/busybox-LFS.patch
+++ b/busybox-LFS.patch
@@ -1,10 +1,10 @@
 diff -Nur busybox-1.00/include/libbb.h.orig busybox-1.00/include/libbb.h
 --- busybox-1.00/include/libbb.h.orig  2005-02-15 16:48:07.491412688 +0100
 +++ busybox-1.00/include/libbb.h       2005-02-15 16:40:15.000000000 +0100
-@@ -137,8 +137,8 @@
- extern char *find_real_root_device_name(void);
+@@ -138,8 +138,8 @@
  extern char *bb_get_line_from_file(FILE *file);
  extern char *bb_get_chomped_line_from_file(FILE *file);
+ extern char *bb_get_chunk_from_file(FILE *file);
 -extern int bb_copyfd_size(int fd1, int fd2, const off_t size);
 -extern int bb_copyfd_eof(int fd1, int fd2);
 +extern off_t bb_copyfd_size(int fd1, int fd2, const off_t size);
@@ -12,7 +12,7 @@ diff -Nur busybox-1.00/include/libbb.h.orig busybox-1.00/include/libbb.h
  extern void  bb_xprint_and_close_file(FILE *file);
  extern int   bb_xprint_file_by_name(const char *filename);
  extern char  bb_process_escape_sequence(const char **ptr);
-@@ -193,6 +193,8 @@
+@@ -195,6 +195,8 @@
  extern int safe_strtod(char *arg, double* value);
  extern int safe_strtol(char *arg, long* value);
  extern int safe_strtoul(char *arg, unsigned long* value);
@@ -24,19 +24,21 @@ diff -Nur busybox-1.00/include/libbb.h.orig busybox-1.00/include/libbb.h
 diff -Nur busybox-1.00/libbb/copyfd.c.orig busybox-1.00/libbb/copyfd.c
 --- busybox-1.00/libbb/copyfd.c.orig   2005-02-15 16:48:45.561625136 +0100
 +++ busybox-1.00/libbb/copyfd.c        2005-02-15 16:39:24.000000000 +0100
-@@ -34,9 +34,9 @@
+@@ -34,10 +34,11 @@
+ #endif
  
  
- /* If size is 0 copy until EOF */
--static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size)
-+static off_t bb_full_fd_action(int src_fd, int dst_fd, const off_t size)
+-static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2)
++static off_t bb_full_fd_action(int src_fd, int dst_fd, const off_t size2)
  {
--      size_t read_total = 0;
-+      off_t read_total = 0;
-       RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+       int status;
+-      size_t xread, wrote, total, size = size2;
++      off_t total;
++      size_t xread, wrote, size = size2;
  
-       while ((size == 0) || (read_total < size)) {
-@@ -76,7 +76,7 @@
+       if (src_fd < 0) {
+               return -1;
+@@ -90,7 +91,7 @@
  }
  
  
@@ -45,7 +47,7 @@ diff -Nur busybox-1.00/libbb/copyfd.c.orig busybox-1.00/libbb/copyfd.c
  {
        if (size) {
                return(bb_full_fd_action(fd1, fd2, size));
-@@ -84,7 +84,7 @@
+@@ -98,7 +99,7 @@
        return(0);
  }
  

diff --git a/busybox-initrd.config b/busybox-initrd.config
index e498c512341a14eaa23efff966cc34b41368e3f9..dc37fbe81c69d8b31989ab10c08db9ed9ff1a4ea 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -42,6 +42,7 @@ PREFIX="./_install"
 # CONFIG_DPKG_DEB is not set
 # CONFIG_GUNZIP is not set
 # CONFIG_GZIP is not set
+# CONFIG_LZMACAT is not set
 # CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
 # CONFIG_TAR is not set
@@ -59,6 +60,7 @@ CONFIG_CAT=y
 # CONFIG_CHOWN is not set
 CONFIG_CHROOT=y
 # CONFIG_CMP is not set
+# CONFIG_COMM is not set
 # CONFIG_CP is not set
 # CONFIG_CUT is not set
 # CONFIG_DATE is not set
@@ -70,6 +72,7 @@ CONFIG_CHROOT=y
 CONFIG_ECHO=y
 CONFIG_FEATURE_FANCY_ECHO=y
 # CONFIG_ENV is not set
+# CONFIG_PRINTENV is not set
 # CONFIG_EXPR is not set
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
@@ -88,13 +91,12 @@ CONFIG_FEATURE_LS_FOLLOWLINKS=y
 # CONFIG_FEATURE_LS_TIMESTAMPS is not set
 # CONFIG_FEATURE_LS_USERNAME is not set
 # CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_AUTOWIDTH is not set
-# CONFIG_FEATURE_HUMAN_READABLE is not set
 # CONFIG_MD5SUM is not set
 CONFIG_MKDIR=y
 # CONFIG_MKFIFO is not set
 CONFIG_MKNOD=y
 # CONFIG_MV is not set
+# CONFIG_NICE is not set
 # CONFIG_OD is not set
 # CONFIG_PRINTF is not set
 CONFIG_PWD=y
@@ -105,7 +107,9 @@ CONFIG_RM=y
 # CONFIG_SHA1SUM is not set
 # CONFIG_SLEEP is not set
 # CONFIG_SORT is not set
+# CONFIG_STAT is not set
 # CONFIG_STTY is not set
+# CONFIG_SUM is not set
 # CONFIG_SYNC is not set
 # CONFIG_TAIL is not set
 # CONFIG_TEE is not set
@@ -130,6 +134,16 @@ CONFIG_USLEEP=y
 # CONFIG_WHOAMI is not set
 # CONFIG_YES is not set
 
+#
+# Common options for ls and more
+#
+# CONFIG_FEATURE_AUTOWIDTH is not set
+
+#
+# Common options for df, du, ls
+#
+# CONFIG_FEATURE_HUMAN_READABLE is not set
+
 #
 # Console Utilities
 #
@@ -137,7 +151,6 @@ CONFIG_USLEEP=y
 # CONFIG_CLEAR is not set
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
-# CONFIG_LOADACM is not set
 # CONFIG_LOADFONT is not set
 # CONFIG_LOADKMAP is not set
 # CONFIG_OPENVT is not set
@@ -154,6 +167,12 @@ CONFIG_USLEEP=y
 # CONFIG_START_STOP_DAEMON is not set
 # CONFIG_WHICH is not set
 
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_LSATTR is not set
+
 #
 # Editors
 #
@@ -177,7 +196,6 @@ CONFIG_FEATURE_AWK_MATH=y
 CONFIG_HALT=y
 CONFIG_POWEROFF=y
 CONFIG_REBOOT=y
-# CONFIG_MINIT is not set
 # CONFIG_MESG is not set
 
 #
@@ -203,6 +221,7 @@ CONFIG_REBOOT=y
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
 # CONFIG_DEVFSD is not set
+# CONFIG_EJECT is not set
 # CONFIG_LAST is not set
 # CONFIG_HDPARM is not set
 # CONFIG_MAKEDEVS is not set
@@ -216,7 +235,6 @@ CONFIG_REBOOT=y
 # Linux Module Utilities
 #
 CONFIG_INSMOD=y
-# CONFIG_FEATURE_2_2_MODULES is not set
 CONFIG_FEATURE_2_4_MODULES=y
 CONFIG_FEATURE_2_6_MODULES=y
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
@@ -233,6 +251,8 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 #
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_ARPING is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
 # CONFIG_FTPGET is not set
 # CONFIG_FTPPUT is not set
 # CONFIG_HOSTNAME is not set
@@ -271,6 +291,7 @@ CONFIG_ROUTE=y
 CONFIG_UDHCPC=y
 # CONFIG_FEATURE_UDHCP_SYSLOG is not set
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_ZCIP is not set
 
 #
 # Process Utilities
@@ -313,15 +334,9 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 #
 # Bourne Shell Options
 #
-# CONFIG_FEATURE_COMMAND_EDITING is not set
-# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
-# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_COMMAND_HISTORY=15
-CONFIG_FEATURE_SH_STANDALONE_SHELL=y
-# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
-# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_FEATURE_SH_STANDALONE_SHELL=y
+# CONFIG_FEATURE_COMMAND_EDITING is not set
 
 #
 # System Logging Utilities
@@ -347,9 +362,9 @@ CONFIG_LOSETUP=y
 # CONFIG_MKSWAP is not set
 # CONFIG_MORE is not set
 CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCHROOT=y
 # CONFIG_RDATE is not set
 # CONFIG_SWAPONOFF is not set
-CONFIG_SWITCHROOT=y
 CONFIG_MOUNT=y
 CONFIG_RAID_START=y
 CONFIG_NFSMOUNT=y
@@ -361,6 +376,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
+# CONFIG_READPROFILE is not set
 
 #
 # Debugging Options

diff --git a/busybox-pivot_root.patch b/busybox-pivot_root.patch
index eec20f5933e6982d4430d21b3d7913ae5f5f1695..103de1b330ac4cede6d0b3569e85ef9e5f73a8e4 100644 (file)
--- a/busybox-pivot_root.patch
+++ b/busybox-pivot_root.patch
@@ -20,6 +20,6 @@ diff -urN busybox-1.00-pre2.org/libbb/syscalls.c busybox-1.00-pre2/libbb/syscall
 +# endif
 +#endif
 +
- int sysfs( int option, unsigned int fs_index, char * buf)
+ int sysfs(int option, unsigned int fs_index, char * buf)
  {
        return(syscall(__NR_sysfs, option, fs_index, buf));

diff --git a/busybox.config b/busybox.config
index 8ccb5c6d4139b716ed49386a6341a56d59bd87a8..4629a845b56c110be5b20118fd9a59787cdcb9b9 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -44,22 +44,20 @@ CONFIG_CPIO=y
 CONFIG_DPKG=y
 CONFIG_DPKG_DEB=y
 CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
-CONFIG_FEATURE_DEB_TAR_GZ=y
-CONFIG_FEATURE_DEB_TAR_BZ2=y
 CONFIG_GUNZIP=y
 CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
 CONFIG_GZIP=y
+CONFIG_LZMACAT=y
 CONFIG_RPM2CPIO=y
 CONFIG_RPM=y
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
-CONFIG_FEATURE_TAR_EXCLUDE=y
+CONFIG_FEATURE_TAR_FROM=y
 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_FROM=y
 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
 CONFIG_UNCOMPRESS=y
 CONFIG_UNZIP=y
@@ -69,6 +67,12 @@ CONFIG_UNZIP=y
 #
 CONFIG_FEATURE_UNARCHIVE_TAPE=y
 
+#
+# Common options for dpkg and dpkg_deb
+#
+CONFIG_FEATURE_DEB_TAR_GZ=y
+CONFIG_FEATURE_DEB_TAR_BZ2=y
+
 #
 # Coreutils
 #
@@ -80,6 +84,7 @@ CONFIG_CHMOD=y
 CONFIG_CHOWN=y
 CONFIG_CHROOT=y
 CONFIG_CMP=y
+CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_CUT=y
 CONFIG_DATE=y
@@ -98,6 +103,7 @@ CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
 CONFIG_ECHO=y
 CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_ENV=y
+CONFIG_PRINTENV=y
 CONFIG_EXPR=y
 CONFIG_FALSE=y
 
@@ -126,6 +132,7 @@ CONFIG_MKDIR=y
 CONFIG_MKFIFO=y
 CONFIG_MKNOD=y
 CONFIG_MV=y
+CONFIG_NICE=y
 CONFIG_OD=y
 CONFIG_PRINTF=y
 CONFIG_PWD=y
@@ -137,7 +144,11 @@ CONFIG_SHA1SUM=y
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_SORT=y
+CONFIG_SORT_BIG=y
+CONFIG_STAT=y
+# CONFIG_FEATURE_STAT_FORMAT is not set
 CONFIG_STTY=y
+CONFIG_SUM=y
 CONFIG_SYNC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -195,7 +206,6 @@ CONFIG_CHVT=y
 CONFIG_CLEAR=y
 CONFIG_DEALLOCVT=y
 CONFIG_DUMPKMAP=y
-CONFIG_LOADACM=y
 CONFIG_LOADFONT=y
 CONFIG_LOADKMAP=y
 CONFIG_OPENVT=y
@@ -208,10 +218,17 @@ CONFIG_SETKEYCODES=y
 CONFIG_MKTEMP=y
 # CONFIG_PIPE_PROGRESS is not set
 CONFIG_READLINK=y
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
 CONFIG_RUN_PARTS=y
 CONFIG_START_STOP_DAEMON=y
 CONFIG_WHICH=y
 
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_LSATTR=y
+
 #
 # Editors
 #
@@ -273,6 +290,7 @@ CONFIG_DELGROUP=y
 CONFIG_ADDUSER=y
 CONFIG_DELUSER=y
 CONFIG_GETTY=y
+CONFIG_FEATURE_U_W_TMP=y
 CONFIG_LOGIN=y
 CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
@@ -294,6 +312,7 @@ CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
 CONFIG_CRONTAB=y
 CONFIG_DC=y
 # CONFIG_DEVFSD is not set
+CONFIG_EJECT=y
 CONFIG_LAST=y
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
@@ -313,7 +332,6 @@ CONFIG_WATCHDOG=y
 # Linux Module Utilities
 #
 CONFIG_INSMOD=y
-# CONFIG_FEATURE_2_2_MODULES is not set
 CONFIG_FEATURE_2_4_MODULES=y
 CONFIG_FEATURE_2_6_MODULES=y
 CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
@@ -322,7 +340,7 @@ CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
 CONFIG_FEATURE_INSMOD_LOAD_MAP=y
 CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
 CONFIG_LSMOD=y
-CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODPROBE=y
 CONFIG_RMMOD=y
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
@@ -332,6 +350,8 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 #
 CONFIG_FEATURE_IPV6=y
 CONFIG_ARPING=y
+CONFIG_ETHER_WAKE=y
+CONFIG_FAKEIDENTD=y
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 CONFIG_HOSTNAME=y
@@ -344,7 +364,6 @@ CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y
 CONFIG_FEATURE_HTTPD_CGI=y
 CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_FEATURE_HTTPD_SET_CGI_VARS_TO_ENV=y
 CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -394,6 +413,7 @@ CONFIG_IPROUTE=y
 CONFIG_IPTUNNEL=y
 CONFIG_NAMEIF=y
 CONFIG_NC=y
+CONFIG_NC_GAPING_SECURITY_HOLE=y
 CONFIG_NETSTAT=y
 CONFIG_NSLOOKUP=y
 CONFIG_PING=y
@@ -427,6 +447,7 @@ CONFIG_UDHCPC=y
 CONFIG_DUMPLEASES=y
 # CONFIG_FEATURE_UDHCP_SYSLOG is not set
 CONFIG_FEATURE_UDHCP_DEBUG=y
+CONFIG_ZCIP=y
 
 #
 # Process Utilities
@@ -456,6 +477,7 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_TIMEOUT is not set
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
@@ -471,15 +493,14 @@ CONFIG_MSH=y
 #
 # Bourne Shell Options
 #
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_FEATURE_SH_STANDALONE_SHELL=y
 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=y
-# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
 # CONFIG_FEATURE_SH_FANCY_PROMPT is not set
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 
 #
 # System Logging Utilities
@@ -501,6 +522,7 @@ CONFIG_FEATURE_FBSET_READMODE=y
 CONFIG_FDFLUSH=y
 CONFIG_FDFORMAT=y
 CONFIG_FDISK=y
+FDISK_SUPPORT_LARGE_DISKS=y
 CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
@@ -524,9 +546,9 @@ CONFIG_MKSWAP=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCHROOT=y
 CONFIG_RDATE=y
 CONFIG_SWAPONOFF=y
-CONFIG_SWITCHROOT=y
 CONFIG_MOUNT=y
 CONFIG_RAID_START=y
 CONFIG_NFSMOUNT=y
@@ -539,6 +561,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MTAB_SUPPORT=y
 CONFIG_FEATURE_MTAB_FILENAME="/etc/mtab"
+CONFIG_READPROFILE=y
 
 #
 # Debugging Options