Skip to content

Commit

Permalink
busybox: update 1.18.0 to 1.18.1
Browse files Browse the repository at this point in the history
* 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
Show file tree
Hide file tree
Showing 15 changed files with 275 additions and 171 deletions.
2 changes: 1 addition & 1 deletion conf/distro/include/preferred-slugos-versions.inc
Expand Up @@ -29,7 +29,7 @@ PREFERRED_VERSION_automake-native ?= "1.11.1"
PREFERRED_VERSION_binutils ?= "2.20.1"
PREFERRED_VERSION_binutils-cross ?= "2.20.1"
PREFERRED_VERSION_binutils-cross-sdk ?= "2.20.1"
PREFERRED_VERSION_busybox ?= "1.18.0"
PREFERRED_VERSION_busybox ?= "1.18.1"
PREFERRED_VERSION_dbus ?= "1.2.3"
PREFERRED_VERSION_eglibc ?= "2.11"
PREFERRED_VERSION_eglibc-initial ?= "2.11"
Expand Down
21 changes: 0 additions & 21 deletions recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch

This file was deleted.

17 changes: 0 additions & 17 deletions recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch

This file was deleted.

118 changes: 0 additions & 118 deletions recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch

This file was deleted.

20 changes: 20 additions & 0 deletions recipes/busybox/busybox-1.18.1/busybox-1.18.1-cpio.patch
@@ -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 */

0 comments on commit 1a63cae

Please sign in to comment.