From 03c40cce7cf5c9791661544da396ab61e396ad8a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 21 Nov 2006 10:02:56 +0000 Subject: busybox: Sync with OE.dev git-svn-id: https://svn.o-hand.com/repos/poky/trunk@902 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/busybox/busybox-1.01/nylon/defconfig | 2 +- meta/packages/busybox/busybox-1.01/uclibc_posix.patch | 7 ++++--- meta/packages/busybox/busybox-1.01/xargs-double-size.patch | 13 +++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 meta/packages/busybox/busybox-1.01/xargs-double-size.patch (limited to 'meta/packages/busybox/busybox-1.01') diff --git a/meta/packages/busybox/busybox-1.01/nylon/defconfig b/meta/packages/busybox/busybox-1.01/nylon/defconfig index 599051bafb..3e4257ef04 100644 --- a/meta/packages/busybox/busybox-1.01/nylon/defconfig +++ b/meta/packages/busybox/busybox-1.01/nylon/defconfig @@ -51,7 +51,7 @@ CONFIG_GZIP=y # CONFIG_RPM is not set CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_BZIP2 is not set CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_GZIP=y CONFIG_FEATURE_TAR_COMPRESS=y diff --git a/meta/packages/busybox/busybox-1.01/uclibc_posix.patch b/meta/packages/busybox/busybox-1.01/uclibc_posix.patch index aefb994068..186f3f9c3a 100644 --- a/meta/packages/busybox/busybox-1.01/uclibc_posix.patch +++ b/meta/packages/busybox/busybox-1.01/uclibc_posix.patch @@ -1,12 +1,13 @@ see http://www.busybox.net/lists/busybox/2004-December/013276.html +and http://bugs.openembedded.org/show_bug.cgi?id=657 ---- busybox-old/libbb/loop.c 2004-08-16 04:36:28.000000000 -0400 -+++ busybox/libbb/loop.c 2004-12-04 23:45:58.000000000 -0500 +--- busybox-1.01/libbb/loop.c 2006/03/13 22:18:47 1.1 ++++ busybox-1.01/libbb/loop.c 2006/03/13 22:19:57 @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -+#include ++#include #include #include #include diff --git a/meta/packages/busybox/busybox-1.01/xargs-double-size.patch b/meta/packages/busybox/busybox-1.01/xargs-double-size.patch new file mode 100644 index 0000000000..218d6c0d1c --- /dev/null +++ b/meta/packages/busybox/busybox-1.01/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.01/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.01/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); -- cgit v1.2.3