wok-6.x rev 5925
busybox: remove unused applets fgconsole loadfont fbset readprofile and smemcap
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Jul 29 09:43:44 2010 +0200 (2010-07-29) |
parents | c29991cef110 |
children | 93a6f8a9ac3f |
files | busybox/stuff/busybox-1.17.1-cpio-mkdir.u busybox/stuff/busybox-1.17.1-depmod.u busybox/stuff/busybox-1.17.1-stat.u busybox/stuff/busybox-1.17.1.config |
line diff
1.1 --- a/busybox/stuff/busybox-1.17.1-cpio-mkdir.u Wed Jul 28 14:15:27 2010 +0200 1.2 +++ b/busybox/stuff/busybox-1.17.1-cpio-mkdir.u Thu Jul 29 09:43:44 2010 +0200 1.3 @@ -1,4 +1,4 @@ 1.4 -FIXME: Add test case !! 1.5 +avoid 'not created: newer or same age file exists' message for directories 1.6 --- busybox-1.17.1/archival/libunarchive/data_extract_all.c 1.7 +++ busybox-1.17.1/archival/libunarchive/data_extract_all.c 1.8 @@ -69,7 +69,8 @@ 1.9 @@ -11,3 +11,23 @@ 1.10 bb_error_msg("%s not created: newer or " 1.11 "same age file exists", file_header->name); 1.12 } 1.13 + 1.14 +--- busybox-1.17.1/testsuite/cpio.tests 1.15 ++++ busybox-1.17.1/testsuite/cpio.tests 1.16 +@@ -114,6 +114,16 @@ 1.17 + " "" "" 1.18 + SKIP= 1.19 + 1.20 ++# avoid 'not created: newer or same age file exists' message for directories 1.21 ++rm -rf cpio.testdir cpio.testdir2 2>/dev/null 1.22 ++mkdir cpio.testdir 1.23 ++testing "cpio extracts in existing directory" \ 1.24 ++"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \ 1.25 ++"\ 1.26 ++1 blocks 1.27 ++0 1.28 ++" "" "" 1.29 ++SKIP= 1.30 + 1.31 + # Clean up 1.32 + rm -rf cpio.testdir cpio.testdir2 2>/dev/null
2.1 --- a/busybox/stuff/busybox-1.17.1-depmod.u Wed Jul 28 14:15:27 2010 +0200 2.2 +++ b/busybox/stuff/busybox-1.17.1-depmod.u Thu Jul 29 09:43:44 2010 +0200 2.3 @@ -27,7 +27,7 @@ 2.4 int tmp; 2.5 2.6 - getopt32(argv, "aAb:eF:nr", &moddir_base, NULL); 2.7 -++ getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL); 2.8 ++ getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL); 2.9 argv += optind; 2.10 2.11 /* goto modules location */
3.1 --- a/busybox/stuff/busybox-1.17.1-stat.u Wed Jul 28 14:15:27 2010 +0200 3.2 +++ b/busybox/stuff/busybox-1.17.1-stat.u Thu Jul 29 09:43:44 2010 +0200 3.3 @@ -1,5 +1,5 @@ 3.4 Add non standard stat -m support to display file block list 3.5 -Useful to patch read-only filesystems such as ISO9660 3.6 +Useful to patch read-only filesystems such as ISO9660 or fragmentation checking 3.7 --- busybox-1.17.1/include/usage.src.h 3.8 +++ busybox-1.17.1/include/usage.src.h 3.9 @@ -3979,6 +3979,7 @@
4.1 --- a/busybox/stuff/busybox-1.17.1.config Wed Jul 28 14:15:27 2010 +0200 4.2 +++ b/busybox/stuff/busybox-1.17.1.config Thu Jul 29 09:43:44 2010 +0200 4.3 @@ -1,7 +1,7 @@ 4.4 # 4.5 # Automatically generated make config: don't edit 4.6 # Busybox version: 1.17.1 4.7 -# Wed Jul 28 11:30:01 2010 4.8 +# Wed Jul 28 22:12:02 2010 4.9 # 4.10 CONFIG_HAVE_DOT_CONFIG=y 4.11 4.12 @@ -304,12 +304,12 @@ 4.13 # Console Utilities 4.14 # 4.15 CONFIG_CHVT=y 4.16 -CONFIG_FGCONSOLE=y 4.17 +# CONFIG_FGCONSOLE is not set 4.18 CONFIG_CLEAR=y 4.19 CONFIG_DEALLOCVT=y 4.20 CONFIG_DUMPKMAP=y 4.21 CONFIG_KBD_MODE=y 4.22 -CONFIG_LOADFONT=y 4.23 +# CONFIG_LOADFONT is not set 4.24 CONFIG_LOADKMAP=y 4.25 CONFIG_OPENVT=y 4.26 CONFIG_RESET=y 4.27 @@ -323,12 +323,8 @@ 4.28 CONFIG_SETKEYCODES=y 4.29 CONFIG_SETLOGCONS=y 4.30 # CONFIG_SHOWKEY is not set 4.31 - 4.32 -# 4.33 -# Common options for loadfont and setfont 4.34 -# 4.35 -CONFIG_FEATURE_LOADFONT_PSF2=y 4.36 -CONFIG_FEATURE_LOADFONT_RAW=y 4.37 +# CONFIG_FEATURE_LOADFONT_PSF2 is not set 4.38 +# CONFIG_FEATURE_LOADFONT_RAW is not set 4.39 4.40 # 4.41 # Debian Utilities 4.42 @@ -510,8 +506,8 @@ 4.43 CONFIG_BLKID=y 4.44 CONFIG_DMESG=y 4.45 CONFIG_FEATURE_DMESG_PRETTY=y 4.46 -CONFIG_FBSET=y 4.47 -CONFIG_FEATURE_FBSET_FANCY=y 4.48 +# CONFIG_FBSET is not set 4.49 +# CONFIG_FEATURE_FBSET_FANCY is not set 4.50 # CONFIG_FEATURE_FBSET_READMODE is not set 4.51 CONFIG_FDFLUSH=y 4.52 CONFIG_FDFORMAT=y 4.53 @@ -567,7 +563,7 @@ 4.54 CONFIG_PIVOT_ROOT=y 4.55 CONFIG_RDATE=y 4.56 CONFIG_RDEV=y 4.57 -CONFIG_READPROFILE=y 4.58 +# CONFIG_READPROFILE is not set 4.59 CONFIG_RTCWAKE=y 4.60 CONFIG_SCRIPT=y 4.61 CONFIG_SCRIPTREPLAY=y 4.62 @@ -697,7 +693,7 @@ 4.63 CONFIG_NC=y 4.64 CONFIG_NC_SERVER=y 4.65 CONFIG_NC_EXTRA=y 4.66 -CONFIG_NC_110_COMPAT=y 4.67 +# CONFIG_NC_110_COMPAT is not set 4.68 CONFIG_FEATURE_IPV6=y 4.69 # CONFIG_FEATURE_UNIX_LOCAL is not set 4.70 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y 4.71 @@ -715,7 +711,7 @@ 4.72 CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y 4.73 CONFIG_FTPGET=y 4.74 CONFIG_FTPPUT=y 4.75 -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y 4.76 +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set 4.77 CONFIG_HOSTNAME=y 4.78 CONFIG_HTTPD=y 4.79 CONFIG_FEATURE_HTTPD_RANGES=y 4.80 @@ -768,7 +764,7 @@ 4.81 CONFIG_IPRULE=y 4.82 CONFIG_IPCALC=y 4.83 CONFIG_FEATURE_IPCALC_FANCY=y 4.84 -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y 4.85 +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set 4.86 CONFIG_NAMEIF=y 4.87 # CONFIG_FEATURE_NAMEIF_EXTENDED is not set 4.88 CONFIG_NETSTAT=y 4.89 @@ -851,7 +847,7 @@ 4.90 # 4.91 # Process Utilities 4.92 # 4.93 -CONFIG_SMEMCAP=y 4.94 +# CONFIG_SMEMCAP is not set 4.95 CONFIG_FREE=y 4.96 CONFIG_FUSER=y 4.97 CONFIG_KILL=y