[oe-commits] Khem Raj : uclibc_git.bb: Remove patches applied upstream and update to latest git/master

git version control git at git.openembedded.org
Sat Jan 29 23:47:31 UTC 2011


Module: openembedded.git
Branch: master
Commit: 1888f718dba56c61fbf46c777fd628fe0a529664
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1888f718dba56c61fbf46c777fd628fe0a529664

Author: Khem Raj <raj.khem at gmail.com>
Date:   Sat Jan 29 15:44:44 2011 -0800

uclibc_git.bb: Remove patches applied upstream and update to latest git/master

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

---

 recipes/uclibc/uclibc-git/mips64-no-waitpid.patch |   30 ---------------------
 recipes/uclibc/uclibc_git.bb                      |    3 +-
 2 files changed, 1 insertions(+), 32 deletions(-)

diff --git a/recipes/uclibc/uclibc-git/mips64-no-waitpid.patch b/recipes/uclibc/uclibc-git/mips64-no-waitpid.patch
deleted file mode 100644
index 880bb7a..0000000
--- a/recipes/uclibc/uclibc-git/mips64-no-waitpid.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
-===================================================================
---- git.orig/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch	2011-01-16 21:23:04.612324001 -0800
-+++ git/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch	2011-01-16 21:27:57.342324000 -0800
-@@ -10,7 +10,9 @@
- 
- libc_linux_arch_CSRC = fork.c
- libc_linux_arch_SSRC = clone.S vfork.S
--
-+ifneq ($(CONFIG_MIPS_O32_ABI),y)
-+libc_linux_arch_SSRC-OMIT = waitpid.S
-+endif
- ASFLAGS += -DUSE___THREAD
- 
- CFLAGS-OMIT-fork.c = -DNOT_IN_libc -DIS_IN_libpthread
-Index: git/libc/sysdeps/linux/common/Makefile.in
-===================================================================
---- git.orig/libc/sysdeps/linux/common/Makefile.in	2011-01-16 21:33:51.302324000 -0800
-+++ git/libc/sysdeps/linux/common/Makefile.in	2011-01-16 21:41:01.812324000 -0800
-@@ -44,6 +44,10 @@
- CSRC := $(filter-out vfork.c, $(CSRC))
- else ifeq ($(TARGET_ARCH),x86_64)
- CSRC := $(filter-out vfork.c, $(CSRC))
-+else ifeq ($(TARGET_ARCH),mips)
-+ifeq ($(CONFIG_MIPS_O32_ABI),y)
-+CSRC := $(filter-out waitpid.c, $(CSRC))
-+endif
- else
- CSRC := $(filter-out waitpid.c, $(CSRC))
- endif
diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb
index f3e6dfb..c24dbc2 100644
--- a/recipes/uclibc/uclibc_git.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.32"
-SRCREV="541f53cf24819079242079c5da79d9c5df9a27a8"
+SRCREV="094d82d3b3e8f8c8460a802b7a9548f3ae4fda46"
 PR_append = "+gitr${SRCPV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -38,7 +38,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
 	file://include-arm-asm.h.patch \
 	file://detect-bx-availibility.patch \
 	file://remove-eabi-oabi-selection.patch \
-	file://mips64-no-waitpid.patch \
 	file://powerpc_copysignl.patch \
 	"
 S = "${WORKDIR}/git"





More information about the Openembedded-commits mailing list