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

MartinDietze commit openembedded-commits at lists.openembedded.org
Wed Sep 20 12:57:50 UTC 2006


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

Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: e97ac2dbf09209dcc54ff6c2294195f1c3e9748f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e97ac2dbf09209dcc54ff6c2294195f1c3e9748f
Files:
1
packages/busybox/busybox-1.00/linux-types.patch
packages/busybox/busybox-1.00/xargs-double-size.patch
packages/busybox/busybox-1.01/xargs-double-size.patch
packages/busybox/busybox-1.2.0/xargs-double-size.patch
packages/busybox/busybox-1.2.1/xargs-double-size.patch
packages/busybox/busybox_1.00.bb
packages/busybox/busybox_1.01.bb
packages/busybox/busybox_1.2.0.bb
packages/busybox/busybox_1.2.1.bb
Diffs:

#
# mt diff -re942c8d500cab4e5911f8934c7f28c044886af67 -re97ac2dbf09209dcc54ff6c2294195f1c3e9748f
#
# 
# 
# add_file "packages/busybox/busybox-1.00/linux-types.patch"
#  content [ddb49b3d0ffcf7f01582ed72ac766a4874a376ac]
# 
# add_file "packages/busybox/busybox-1.00/xargs-double-size.patch"
#  content [e4309367814c66d66f29357b8fee81a5bd22dc81]
# 
# add_file "packages/busybox/busybox-1.01/xargs-double-size.patch"
#  content [d40d3062d7e168d67e5cacb20492873db61ef6d8]
# 
# add_file "packages/busybox/busybox-1.2.0/xargs-double-size.patch"
#  content [905bcfb26a500faf77c27338e137d8fff94a6c51]
# 
# add_file "packages/busybox/busybox-1.2.1/xargs-double-size.patch"
#  content [e1cf012875bdca28d9046493d5217f0e8ebe8458]
# 
# patch "packages/busybox/busybox_1.00.bb"
#  from [4ff6be477a0b864b7e2b5f65d52c543b83425847]
#    to [41ad13a8a72bcad463b63f3497460961e8c96d9d]
# 
# patch "packages/busybox/busybox_1.01.bb"
#  from [40c9ed02ef2213409930919991ec609a781ededc]
#    to [d097d7782fd60adb5bfd5c2d8af0e1e39c5805dd]
# 
# patch "packages/busybox/busybox_1.2.0.bb"
#  from [9f781eb51d8c2368d2c767fa9377d66489acd2eb]
#    to [a59cd819245b5ee793e5c0e4a33af4c346bd8a92]
# 
# patch "packages/busybox/busybox_1.2.1.bb"
#  from [e826bea54d0588e5c234771464aa50b17b7f5de6]
#    to [bbe33912384542abb69cc536abf7587f2d742a05]
# 
============================================================
--- packages/busybox/busybox-1.00/linux-types.patch	ddb49b3d0ffcf7f01582ed72ac766a4874a376ac
+++ packages/busybox/busybox-1.00/linux-types.patch	ddb49b3d0ffcf7f01582ed72ac766a4874a376ac
@@ -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>
============================================================
--- packages/busybox/busybox-1.00/xargs-double-size.patch	e4309367814c66d66f29357b8fee81a5bd22dc81
+++ packages/busybox/busybox-1.00/xargs-double-size.patch	e4309367814c66d66f29357b8fee81a5bd22dc81
@@ -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);
============================================================
--- packages/busybox/busybox-1.01/xargs-double-size.patch	d40d3062d7e168d67e5cacb20492873db61ef6d8
+++ packages/busybox/busybox-1.01/xargs-double-size.patch	d40d3062d7e168d67e5cacb20492873db61ef6d8
@@ -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);
============================================================
--- packages/busybox/busybox-1.2.0/xargs-double-size.patch	905bcfb26a500faf77c27338e137d8fff94a6c51
+++ packages/busybox/busybox-1.2.0/xargs-double-size.patch	905bcfb26a500faf77c27338e137d8fff94a6c51
@@ -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);
============================================================
--- packages/busybox/busybox-1.2.1/xargs-double-size.patch	e1cf012875bdca28d9046493d5217f0e8ebe8458
+++ packages/busybox/busybox-1.2.1/xargs-double-size.patch	e1cf012875bdca28d9046493d5217f0e8ebe8458
@@ -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);
============================================================
--- packages/busybox/busybox_1.00.bb	4ff6be477a0b864b7e2b5f65d52c543b83425847
+++ packages/busybox/busybox_1.00.bb	41ad13a8a72bcad463b63f3497460961e8c96d9d
@@ -44,6 +44,10 @@ SRC_URI = "http://www.busybox.net/downlo
 	   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}"
============================================================
--- packages/busybox/busybox_1.01.bb	40c9ed02ef2213409930919991ec609a781ededc
+++ packages/busybox/busybox_1.01.bb	d097d7782fd60adb5bfd5c2d8af0e1e39c5805dd
@@ -40,7 +40,9 @@ SRC_URI = "http://www.busybox.net/downlo
 	   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}"
 
============================================================
--- packages/busybox/busybox_1.2.0.bb	9f781eb51d8c2368d2c767fa9377d66489acd2eb
+++ packages/busybox/busybox_1.2.0.bb	a59cd819245b5ee793e5c0e4a33af4c346bd8a92
@@ -21,7 +21,6 @@ SRC_URI = "http://www.busybox.net/downlo
 #	   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/downlo
 	   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}"
============================================================
--- packages/busybox/busybox_1.2.1.bb	e826bea54d0588e5c234771464aa50b17b7f5de6
+++ packages/busybox/busybox_1.2.1.bb	bbe33912384542abb69cc536abf7587f2d742a05
@@ -28,6 +28,8 @@ SRC_URI = "http://www.busybox.net/downlo
 	   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"






More information about the Openembedded-commits mailing list