From 2ca840b83ddd797f872bd6cc282991ec2b60e3ed Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 12 Jun 2011 15:57:45 +0200
Subject: update default kernel to 2.6.39

---
 toolchain/uClibc/patches/gnutar-problem.patch | 20 +++++++++++++-------
 toolchain/uClibc/patches/ld64.patch           | 12 ------------
 2 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 toolchain/uClibc/patches/ld64.patch

(limited to 'toolchain/uClibc/patches')

diff --git a/toolchain/uClibc/patches/gnutar-problem.patch b/toolchain/uClibc/patches/gnutar-problem.patch
index c797ea0b0..a3d71131a 100644
--- a/toolchain/uClibc/patches/gnutar-problem.patch
+++ b/toolchain/uClibc/patches/gnutar-problem.patch
@@ -1,12 +1,18 @@
 diff -Nur uClibc-0.9.32-rc3.orig/Makefile.in uClibc-0.9.32-rc3/Makefile.in
 --- uClibc-0.9.32-rc3.orig/Makefile.in	2011-03-16 20:11:13.000000000 +0100
-+++ uClibc-0.9.32-rc3/Makefile.in	2011-03-18 18:00:13.000000000 +0100
-@@ -383,6 +383,8 @@
- # Installs run-time libraries
- install_runtime: all | $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
++++ uClibc-0.9.32-rc3/Makefile.in	2011-05-20 11:16:00.000000000 +0200
+@@ -385,13 +385,13 @@
  ifeq ($(HAVE_SHARED),y)
-+	$(INSTALL) -m 755 $(top_builddir)lib/ld-uClibc-$(VERSION).so \
-+		$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
  	$(INSTALL) -m 755 $(top_builddir)lib/lib*-$(VERSION).so \
  		$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
- 	(cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
+-	(cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
+ 	@if [ -x $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \
+ 		set -e; \
+ 		$(SHELL_SET_X); \
+ 		$(INSTALL) -m 755 $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \
+ 			$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR); \
+ 	fi
++	(cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
+ endif
+ 
+ utils: | pregen
diff --git a/toolchain/uClibc/patches/ld64.patch b/toolchain/uClibc/patches/ld64.patch
deleted file mode 100644
index 2a9cc22b3..000000000
--- a/toolchain/uClibc/patches/ld64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur uClibc-0.9.32-rc3.orig/Rules.mak uClibc-0.9.32-rc3/Rules.mak
---- uClibc-0.9.32-rc3.orig/Rules.mak	2011-03-16 20:11:13.000000000 +0100
-+++ uClibc-0.9.32-rc3/Rules.mak	2011-05-08 21:55:43.986610132 +0200
-@@ -120,7 +120,7 @@
- SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
- UBACKTRACE_DSO := libubacktrace.so.$(MAJOR_VERSION)
- ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
--UCLIBC_LDSO_NAME := ld64-uClibc
-+UCLIBC_LDSO_NAME := ld-uClibc
- ARCH_NATIVE_BIT := 64
- else
- UCLIBC_LDSO_NAME := ld-uClibc
-- 
cgit v1.2.3