[oe-commits] Eric Bénard : busybox 1.18.0 : add last fixes

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b116445f606d5b04bcc2e671b3d59ea36952edd6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b116445f606d5b04bcc2e671b3d59ea36952edd6

Author: Eric Bénard <eric at eukrea.com>
Date:   Fri Dec 17 16:54:00 2010 +0100

busybox 1.18.0 : add last fixes

from : http://busybox.net/downloads/fixes-1.18.0/

Signed-off-by: Eric Bénard <eric at eukrea.com>

---

 .../busybox-1.18.0/busybox-1.18.0-runsvdir.patch   |   17 +++++++++++++++++
 recipes/busybox/busybox_1.18.0.bb                  |    3 ++-
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch b/recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch
new file mode 100644
index 0000000..41ad570
--- /dev/null
+++ b/recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch
@@ -0,0 +1,17 @@
+diff -urpN busybox-1.18.0/runit/runsvdir.c busybox-1.18.0-runsvdir/runit/runsvdir.c
+--- busybox-1.18.0/runit/runsvdir.c	2010-11-22 21:43:22.000000000 +0100
++++ busybox-1.18.0-runsvdir/runit/runsvdir.c	2010-12-06 01:27:56.926036992 +0100
+@@ -312,8 +312,11 @@ int runsvdir_main(int argc UNUSED_PARAM,
+ 						last_mtime = s.st_mtime;
+ 						last_dev = s.st_dev;
+ 						last_ino = s.st_ino;
+-						//if (now <= mtime)
+-						//	sleep(1);
++						/* if the svdir changed this very second, wait until the
++						 * next second, because we won't be able to detect more
++						 * changes within this second */
++						while (time(NULL) == last_mtime)
++							usleep(100000);
+ 						need_rescan = do_rescan();
+ 						while (fchdir(curdir) == -1) {
+ 							warn2_cannot("change directory, pausing", "");
diff --git a/recipes/busybox/busybox_1.18.0.bb b/recipes/busybox/busybox_1.18.0.bb
index 56b5151..d11dffe 100644
--- a/recipes/busybox/busybox_1.18.0.bb
+++ b/recipes/busybox/busybox_1.18.0.bb
@@ -1,11 +1,12 @@
 require busybox_1.1x.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI += " \
 	file://busybox-1.18.0-buildsys.patch \
 	file://busybox-1.18.0-sha.patch \
+	file://busybox-1.18.0-runsvdir.patch \
 	"
 
 SRC_URI[md5sum] = "7a8150a10558a5292fa1f52f1c65b0f5"