# HG changeset patch # User Christopher Rogers # Date 1296074308 0 # Node ID ffc5675acd455c7a62f9023237c4be0d0b50fa13 # Parent 890c8247a34984658e284f11c17c3395c7b72629 Fixed busybox again. Cpio patch is not need as of 1.18.2. diff -r 890c8247a349 -r ffc5675acd45 busybox/receipt --- a/busybox/receipt Wed Jan 26 18:23:31 2011 +0000 +++ b/busybox/receipt Wed Jan 26 20:38:28 2011 +0000 @@ -28,7 +28,6 @@ zmodules.u printable.u cmdline.u -cpio.u EOT cp ../stuff/$PACKAGE-$VERSION.config .config { make oldconfig && @@ -55,7 +54,6 @@ zmodules.u printable.u cmdline.u -cpio.u EOT cp ../stuff/$PACKAGE-$VERSION.config .config make oldconfig diff -r 890c8247a349 -r ffc5675acd45 busybox/stuff/busybox-1.18.2-cpio.u --- a/busybox/stuff/busybox-1.18.2-cpio.u Wed Jan 26 18:23:31 2011 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -Enable filters for cpio -i and cpio -t ---- busybox-1.18.1/archival/cpio.c -+++ busybox-1.18.1/archival/cpio.c -@@ -309,7 +309,7 @@ - - #if !ENABLE_FEATURE_CPIO_O - /* no parameters */ -- opt_complementary = "=0"; -+ // -i may have parameters //opt_complementary = "=0"; - opt = getopt32(argv, OPTION_STR, &cpio_filename); - argv += optind; - if (opt & CPIO_OPT_FILE) { /* -F */ -@@ -317,7 +317,7 @@ - } - #else - /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */ -- opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0"; -+ // -i may have parameters //opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0"; - opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt); - argv += optind; - if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */