# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1280389424 -7200
# Node ID f5d1df2b1b216e4123869044af9a5520812b2039
# Parent  c29991cef110d2d8da624bf191e8c7380207cd8b
busybox: remove unused applets fgconsole loadfont fbset readprofile and smemcap

diff -r c29991cef110 -r f5d1df2b1b21 busybox/stuff/busybox-1.17.1-cpio-mkdir.u
--- a/busybox/stuff/busybox-1.17.1-cpio-mkdir.u	Wed Jul 28 14:15:27 2010 +0200
+++ b/busybox/stuff/busybox-1.17.1-cpio-mkdir.u	Thu Jul 29 09:43:44 2010 +0200
@@ -1,4 +1,4 @@
-FIXME: Add test case !!
+avoid 'not created: newer or same age file exists' message for directories
 --- busybox-1.17.1/archival/libunarchive/data_extract_all.c
 +++ busybox-1.17.1/archival/libunarchive/data_extract_all.c
 @@ -69,7 +69,8 @@
@@ -11,3 +11,23 @@
  				bb_error_msg("%s not created: newer or "
  					"same age file exists", file_header->name);
  			}
+
+--- busybox-1.17.1/testsuite/cpio.tests
++++ busybox-1.17.1/testsuite/cpio.tests
+@@ -114,6 +114,16 @@
+ " "" ""
+ SKIP=
+ 
++# avoid 'not created: newer or same age file exists' message for directories
++rm -rf cpio.testdir cpio.testdir2 2>/dev/null
++mkdir cpio.testdir
++testing "cpio extracts in existing directory" \
++"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \
++"\
++1 blocks
++0
++" "" ""
++SKIP=
+ 
+ # Clean up
+ rm -rf cpio.testdir cpio.testdir2 2>/dev/null
diff -r c29991cef110 -r f5d1df2b1b21 busybox/stuff/busybox-1.17.1-depmod.u
--- a/busybox/stuff/busybox-1.17.1-depmod.u	Wed Jul 28 14:15:27 2010 +0200
+++ b/busybox/stuff/busybox-1.17.1-depmod.u	Thu Jul 29 09:43:44 2010 +0200
@@ -27,7 +27,7 @@
  	int tmp;
  
 -	getopt32(argv, "aAb:eF:nr", &moddir_base, NULL);
-++	getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
++	getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
  	argv += optind;
  
  	/* goto modules location */
diff -r c29991cef110 -r f5d1df2b1b21 busybox/stuff/busybox-1.17.1-stat.u
--- a/busybox/stuff/busybox-1.17.1-stat.u	Wed Jul 28 14:15:27 2010 +0200
+++ b/busybox/stuff/busybox-1.17.1-stat.u	Thu Jul 29 09:43:44 2010 +0200
@@ -1,5 +1,5 @@
 Add non standard stat -m support to display file block list
-Useful to patch read-only filesystems such as ISO9660
+Useful to patch read-only filesystems such as ISO9660 or fragmentation checking
 --- busybox-1.17.1/include/usage.src.h
 +++ busybox-1.17.1/include/usage.src.h
 @@ -3979,6 +3979,7 @@
diff -r c29991cef110 -r f5d1df2b1b21 busybox/stuff/busybox-1.17.1.config
--- a/busybox/stuff/busybox-1.17.1.config	Wed Jul 28 14:15:27 2010 +0200
+++ b/busybox/stuff/busybox-1.17.1.config	Thu Jul 29 09:43:44 2010 +0200
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.17.1
-# Wed Jul 28 11:30:01 2010
+# Wed Jul 28 22:12:02 2010
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -304,12 +304,12 @@
 # Console Utilities
 #
 CONFIG_CHVT=y
-CONFIG_FGCONSOLE=y
+# CONFIG_FGCONSOLE is not set
 CONFIG_CLEAR=y
 CONFIG_DEALLOCVT=y
 CONFIG_DUMPKMAP=y
 CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
+# CONFIG_LOADFONT is not set
 CONFIG_LOADKMAP=y
 CONFIG_OPENVT=y
 CONFIG_RESET=y
@@ -323,12 +323,8 @@
 CONFIG_SETKEYCODES=y
 CONFIG_SETLOGCONS=y
 # CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
+# CONFIG_FEATURE_LOADFONT_PSF2 is not set
+# CONFIG_FEATURE_LOADFONT_RAW is not set
 
 #
 # Debian Utilities
@@ -510,8 +506,8 @@
 CONFIG_BLKID=y
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
 # CONFIG_FEATURE_FBSET_READMODE is not set
 CONFIG_FDFLUSH=y
 CONFIG_FDFORMAT=y
@@ -567,7 +563,7 @@
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 CONFIG_RDEV=y
-CONFIG_READPROFILE=y
+# CONFIG_READPROFILE is not set
 CONFIG_RTCWAKE=y
 CONFIG_SCRIPT=y
 CONFIG_SCRIPTREPLAY=y
@@ -697,7 +693,7 @@
 CONFIG_NC=y
 CONFIG_NC_SERVER=y
 CONFIG_NC_EXTRA=y
-CONFIG_NC_110_COMPAT=y
+# CONFIG_NC_110_COMPAT is not set
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -715,7 +711,7 @@
 CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
-CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 CONFIG_HOSTNAME=y
 CONFIG_HTTPD=y
 CONFIG_FEATURE_HTTPD_RANGES=y
@@ -768,7 +764,7 @@
 CONFIG_IPRULE=y
 CONFIG_IPCALC=y
 CONFIG_FEATURE_IPCALC_FANCY=y
-CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
 CONFIG_NAMEIF=y
 # CONFIG_FEATURE_NAMEIF_EXTENDED is not set
 CONFIG_NETSTAT=y
@@ -851,7 +847,7 @@
 #
 # Process Utilities
 #
-CONFIG_SMEMCAP=y
+# CONFIG_SMEMCAP is not set
 CONFIG_FREE=y
 CONFIG_FUSER=y
 CONFIG_KILL=y