diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-12-14 11:31:07 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-12-14 11:31:07 -0800 |
| commit | 7144e15e91b327e75a5270db8457a2c5cfa62f9a (patch) | |
| tree | 51fe609396512c4149041304c3eb305c17205399 /recipes/uclibc | |
| parent | 27e3eff536a83312ad24052570d5056f8bfe8544 (diff) | |
uclibc-nptl: Move to current tip of branch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/uclibc')
| -rw-r--r-- | recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch | 12 | ||||
| -rw-r--r-- | recipes/uclibc/uclibc.inc | 3 | ||||
| -rw-r--r-- | 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 8c2b85db13..0000000000 --- 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 903aea27b9..2045007e72 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 a910590ab8..b1bb497d05 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 \ " |