[oe-commits] Khem Raj : uclibc-nptl: Move to current tip of branch

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 7144e15e91b327e75a5270db8457a2c5cfa62f9a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7144e15e91b327e75a5270db8457a2c5cfa62f9a

Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon Dec 14 11:31:07 2009 -0800

uclibc-nptl: Move to current tip of branch

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch |   12 ------------
 recipes/uclibc/uclibc.inc                          |    3 +++
 recipes/uclibc/uclibc_nptl.bb                      |    3 +--
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch b/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch
deleted file mode 100644
index 8c2b85d..0000000
--- a/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/libc/inet/rpc/rpc_thread.c
-===================================================================
---- git.orig/libc/inet/rpc/rpc_thread.c	2009-12-04 13:13:09.000000000 -0800
-+++ git/libc/inet/rpc/rpc_thread.c	2009-12-04 13:13:17.000000000 -0800
-@@ -14,6 +14,7 @@
- #ifdef __UCLIBC_HAS_THREADS__
- 
- #include <bits/libc-tsd.h>
-+#include <bits/libc-lock.h>
- 
- /* Variable used in non-threaded applications or for the first thread.  */
- static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index 903aea2..2045007 100644
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -181,3 +181,6 @@ do_install() {
 	chmod +x ${D}/${base_libdir}/*
 }
 
+get_monotonic_srcrev () {
+    	(cd ${S}; eval `git rev-list HEAD|wc -l`)
+}
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index a910590..b1bb497 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-SRCREV="b3d31460fbf188997c7337296a61409529f7c974"
+SRCREV="b3b9101a9c495f52c06cb2de27fcf45e6e5f0bf9"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -34,7 +34,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
 	file://uclibc-arm-ftruncate64.patch;patch=1 \
 	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
 	file://uclibc_arm_remove_duplicate_sysdep_defs.patch;patch=1 \
-	file://uclibc_rpc_thread.patch;patch=1 \
 	file://installfix.patch;patch=1 \
 	"