summaryrefslogtreecommitdiff
path: root/package/busybox/busybox-1.16.1-cpio.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-05-01 21:19:19 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-05-01 21:19:19 +0200
commit7548e5a70700e1280f16a8f4c33c68fb883a1821 (patch)
treefd64a873e68f2fa86a1b1d842c4fe0d63e4fbfe5 /package/busybox/busybox-1.16.1-cpio.patch
parentd07aee18c46a6158ea67b51a6d7bb76946ca8698 (diff)
busybox: 1.16.1 fixes for ash and cpio
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/busybox/busybox-1.16.1-cpio.patch')
-rw-r--r--package/busybox/busybox-1.16.1-cpio.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/package/busybox/busybox-1.16.1-cpio.patch b/package/busybox/busybox-1.16.1-cpio.patch
new file mode 100644
index 000000000..e8282bd9d
--- /dev/null
+++ b/package/busybox/busybox-1.16.1-cpio.patch
@@ -0,0 +1,51 @@
+diff -urpN busybox-1.16.1/archival/cpio.c busybox-1.16.1-cpio/archival/cpio.c
+--- busybox-1.16.1/archival/cpio.c 2010-03-20 03:58:07.000000000 +0100
++++ busybox-1.16.1-cpio/archival/cpio.c 2010-04-27 08:15:37.000000000 +0200
+@@ -424,7 +424,7 @@ int cpio_main(int argc UNUSED_PARAM, cha
+ if (archive_handle->cpio__blocks != (off_t)-1
+ && !(opt & CPIO_OPT_QUIET)
+ ) {
+- printf("%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
++ fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
+ }
+
+ return EXIT_SUCCESS;
+diff -urpN busybox-1.16.1/testsuite/cpio.tests busybox-1.16.1-cpio/testsuite/cpio.tests
+--- busybox-1.16.1/testsuite/cpio.tests 2010-03-28 19:59:59.000000000 +0200
++++ busybox-1.16.1-cpio/testsuite/cpio.tests 2010-04-27 08:15:37.000000000 +0200
+@@ -32,7 +32,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev
+ # testing "test name" "command" "expected result" "file input" "stdin"
+
+ testing "cpio extracts zero-sized hardlinks" \
+-"$ECHO -ne '$hexdump' | bzcat | cpio -i; echo \$?;
++"$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?;
+ ls -ln cpio.testdir | $FILTER_LS" \
+ "\
+ 1 blocks
+@@ -45,7 +45,7 @@ ls -ln cpio.testdir | $FILTER_LS" \
+
+ test x"$SKIP_KNOWN_BUGS" = x"" && {
+ # Currently fails. Numerous buglets: "1 blocks" versus "1 block",
+-# "1 block" must go to stderr, does not list cpio.testdir/x and cpio.testdir/y
++# does not list cpio.testdir/x and cpio.testdir/y
+ testing "cpio lists hardlinks" \
+ "$ECHO -ne '$hexdump' | bzcat | cpio -t 2>&1; echo \$?" \
+ "\
+@@ -70,7 +70,7 @@ ln cpio.testdir/nonempty cpio.testdir/no
+ mkdir cpio.testdir2
+
+ testing "cpio extracts zero-sized hardlinks 2" \
+-"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i); echo \$?;
++"find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?;
+ ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \
+ "\
+ 2 blocks
+@@ -87,7 +87,7 @@ ls -ln cpio.testdir2/cpio.testdir | $FIL
+ # Was trying to create "/usr/bin", correct is "usr/bin".
+ rm -rf cpio.testdir
+ testing "cpio -p with absolute paths" \
+-"echo /usr/bin | cpio -dp cpio.testdir; echo \$?;
++"echo /usr/bin | cpio -dp cpio.testdir 2>&1; echo \$?;
+ ls cpio.testdir" \
+ "\
+ 1 blocks