From 555bbd92b49fa2629935cff1e5c43619eee4250b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 25 Jul 2008 07:17:39 +0000
Subject: uclibc initial svn recipe overwrote the FILESDIR wrongly. As a result
 the build for uclibc-initial_cvs.bb was failing because it was not picking
 correct uClibc.distro and uClibc.machine files. Also moved the arm-ftruncate
 patch to files/ because it will be shared by other recipes to be added in
 future.

---
 packages/uclibc/files/uclibc-arm-ftruncate64.patch      | 13 +++++++++++++
 packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch | 13 -------------
 packages/uclibc/uclibc-initial_svn.bb                   |  2 --
 packages/uclibc/uclibc_svn.bb                           |  4 +---
 4 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 packages/uclibc/files/uclibc-arm-ftruncate64.patch
 delete mode 100644 packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch

diff --git a/packages/uclibc/files/uclibc-arm-ftruncate64.patch b/packages/uclibc/files/uclibc-arm-ftruncate64.patch
new file mode 100644
index 0000000000..504d37bcd2
--- /dev/null
+++ b/packages/uclibc/files/uclibc-arm-ftruncate64.patch
@@ -0,0 +1,13 @@
+Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
+===================================================================
+--- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
++++ uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
+@@ -38,4 +38,8 @@
+ /* define if target supports IEEE signed zero floats */
+ #define __UCLIBC_HAVE_SIGNED_ZERO__
+ 
++#ifdef __ARM_EABI__
++# define __UCLIBC_TRUNCATE64_HAS_4_ARGS__
++#endif
++
+ #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */
diff --git a/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch b/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch
deleted file mode 100644
index 504d37bcd2..0000000000
--- a/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
-===================================================================
---- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
-+++ uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
-@@ -38,4 +38,8 @@
- /* define if target supports IEEE signed zero floats */
- #define __UCLIBC_HAVE_SIGNED_ZERO__
- 
-+#ifdef __ARM_EABI__
-+# define __UCLIBC_TRUNCATE64_HAS_4_ARGS__
-+#endif
-+
- #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */
diff --git a/packages/uclibc/uclibc-initial_svn.bb b/packages/uclibc/uclibc-initial_svn.bb
index 9dad654ca4..e742fd55fd 100644
--- a/packages/uclibc/uclibc-initial_svn.bb
+++ b/packages/uclibc/uclibc-initial_svn.bb
@@ -1,8 +1,6 @@
 SECTION = "base"
 require uclibc_svn.bb
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
 DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index f774fd90ee..b7b8960952 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -8,7 +8,7 @@
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r11"
+PR = "r12"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
@@ -28,8 +28,6 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \
             file://uClibc.machine \
             file://uClibc.distro \
             file://uclibc-arm-ftruncate64.patch;patch=1 \
-            file://errno_values.h.patch;patch=1 \
-	    file://build_wcs_upper_buffer.patch;patch=1 \
             file://arm_fix_alignment.patch;patch=1 \
 	    file://unistd_arm.patch;patch=1 \
             "
-- 
cgit v1.2.3