Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 1.18.1 is considered as the latest stable version * add the lastest fixes from http://busybox.net/downloads/fixes-1.18.1/ * default 1.18.1 for SlugOS Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Khem Raj <raj.khem@gmail.com> Cc: Mike Westerhof <mwester@dls.net> Acked-by: Mike Westerhof <mwester@dls.net>
- Loading branch information
Eric BENARD
committed
Dec 30, 2010
1 parent
ce11603
commit 1a63cae
Showing
15 changed files
with
275 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 0 additions & 21 deletions
21
recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch
This file was deleted.
Oops, something went wrong.
17 changes: 0 additions & 17 deletions
17
recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch
This file was deleted.
Oops, something went wrong.
118 changes: 0 additions & 118 deletions
118
recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
diff -urpN busybox-1.18.1/archival/cpio.c busybox-1.18.1-cpio/archival/cpio.c | ||
--- busybox-1.18.1/archival/cpio.c 2010-12-20 01:41:26.000000000 +0100 | ||
+++ busybox-1.18.1-cpio/archival/cpio.c 2010-12-26 02:26:38.000000000 +0100 | ||
@@ -308,16 +308,12 @@ int cpio_main(int argc UNUSED_PARAM, cha | ||
/* -L makes sense only with -o or -p */ | ||
|
||
#if !ENABLE_FEATURE_CPIO_O | ||
- /* no parameters */ | ||
- opt_complementary = "=0"; | ||
opt = getopt32(argv, OPTION_STR, &cpio_filename); | ||
argv += optind; | ||
if (opt & CPIO_OPT_FILE) { /* -F */ | ||
xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO); | ||
} | ||
#else | ||
- /* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */ | ||
- 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 */ |
Oops, something went wrong.