busybox: use a larger buffer in xargs for nylon, patch to compile busybox 1.00 for mtx-[12]

9 files changed, 73 insertions, 1 deletions

diff --git a/packages/busybox/busybox-1.00/linux-types.patch b/packages/busybox/busybox-1.00/linux-types.patch
new file mode 100644
index 0000000000..e312073c9e
--- /dev/null
+++ b/packages/busybox/busybox-1.00/linux-types.patch
@@ -0,0 +1,10 @@
+--- busybox-1.00/libbb/loop.c.org	2006-09-19 18:18:17.084592997 +0200
++++ busybox-1.00/libbb/loop.c	2006-09-19 18:18:09.820275793 +0200
+@@ -19,6 +19,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
++#include <linux/types.h>
+ #include <asm/posix_types.h>
+ #include <stdio.h>
+ #include <errno.h>
diff --git a/packages/busybox/busybox-1.00/xargs-double-size.patch b/packages/busybox/busybox-1.00/xargs-double-size.patch
new file mode 100644
index 0000000000..c7dc900cdd
--- /dev/null
+++ b/packages/busybox/busybox-1.00/xargs-double-size.patch
@@ -0,0 +1,13 @@
+--- busybox-1.00/findutils/xargs.c.org	2006-09-19 18:18:17.084592997 +0200
++++ busybox-1.00/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);
diff --git a/packages/busybox/busybox-1.01/xargs-double-size.patch b/packages/busybox/busybox-1.01/xargs-double-size.patch
new file mode 100644
index 0000000000..218d6c0d1c
--- /dev/null
+++ b/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);
diff --git a/packages/busybox/busybox-1.2.0/xargs-double-size.patch b/packages/busybox/busybox-1.2.0/xargs-double-size.patch
new file mode 100644
index 0000000000..4fd410ca6a
--- /dev/null
+++ b/packages/busybox/busybox-1.2.0/xargs-double-size.patch
@@ -0,0 +1,13 @@
+--- busybox-1.2.0/findutils/xargs.c.org	2006-09-19 18:18:17.084592997 +0200
++++ busybox-1.2.0/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);
diff --git a/packages/busybox/busybox-1.2.1/xargs-double-size.patch b/packages/busybox/busybox-1.2.1/xargs-double-size.patch
new file mode 100644
index 0000000000..df64554ffc
--- /dev/null
+++ b/packages/busybox/busybox-1.2.1/xargs-double-size.patch
@@ -0,0 +1,13 @@
+--- busybox-1.2.1/findutils/xargs.c.org	2006-09-19 18:18:17.084592997 +0200
++++ busybox-1.2.1/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);
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 2dcbc081b6..296c4e080e 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -44,6 +44,10 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://mount.busybox \
 	   file://umount.busybox"
 
+SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
+SRC_URI_append_mtx-1 = " file://linux-types.patch;patch=1"
+SRC_URI_append_mtx-2 = " file://linux-types.patch;patch=1"
+
 S = "${WORKDIR}/busybox-${PV}"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index e43a34aca5..9c8b7e60c3 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -40,7 +40,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://syslog.conf \
 	   file://mount.busybox \
 	   file://umount.busybox"
+
 SRC_URI_append_slugos += " file://sysctl.conf "
+SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
 
 S = "${WORKDIR}/busybox-${PV}"
 
diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb
index d9ed35aadd..d537406d08 100644
--- a/packages/busybox/busybox_1.2.0.bb
+++ b/packages/busybox/busybox_1.2.0.bb
@@ -21,7 +21,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 #	   file://hdparm_M.patch;patch=1 \
 	   file://ifupdown-spurious-environ.patch;patch=1 \
 #	   file://mount-all-type.patch;patch=1 \
-#	   file://readlink.patch;patch=1 \
 #	   file://rmmod.patch;patch=1 \
 	   file://udhcpscript.patch;patch=1 \
            file://defconfig \
@@ -34,6 +33,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://syslog.conf \
 	   file://mount.busybox \
 	   file://umount.busybox"
+
+SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
+
 S = "${WORKDIR}/busybox-1.2.0"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 4c208e2a0b..c27544303a 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -28,6 +28,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://mount.busybox \
 	   file://umount.busybox"
 
+SRC_URI_append_nylon = " file://xargs-double-size.patch;patch=1"
+
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
 PACKAGES =+ "${PN}-httpd ${PN}-udhcpd"