From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 30 May 2010 15:56:55 +0000 (+0200)
Subject: klibc: bump to 1.5.15+1.5.16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a8053b1e522a31ad7e008c9dac723998bd62491;p=openembedded.git

klibc: bump to 1.5.15+1.5.16

* tested on arm with 2.6.26 and 2.6.33, 2.6.34 kernels
---

diff --git a/recipes/klibc/klibc_1.5.15+1.5.16.bb b/recipes/klibc/klibc_1.5.15+1.5.16.bb
index 4b299f226e..694bf5849b 100644
--- a/recipes/klibc/klibc_1.5.15+1.5.16.bb
+++ b/recipes/klibc/klibc_1.5.15+1.5.16.bb
@@ -1,3 +1,3 @@
 require klibc.inc
 require klibc_${PV}.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
diff --git a/recipes/klibc/klibc_1.5.15+1.5.16.inc b/recipes/klibc/klibc_1.5.15+1.5.16.inc
index f638e14626..630ee458ff 100644
--- a/recipes/klibc/klibc_1.5.15+1.5.16.inc
+++ b/recipes/klibc/klibc_1.5.15+1.5.16.inc
@@ -17,14 +17,16 @@ SRC_URI += "file://fstype-sane-vfat-and-jffs2-for-1.5.patch \
             file://mntproc-definitions.patch \
             file://signal-cleanup.patch \
             file://isystem.patch \
-            file://socket.h.patch \
             "
+# upstream in 2.6.33
+SRC_URI += '${@base_version_less_or_equal("PV", "2.6.32", "", "file://socket.h.patch", d)}'
 
 S = "${WORKDIR}/klibc-1.5.15"
 
 # end temporary overrides
 
-DEFAULT_PREFERENCE = "-1"
+# tested on arm with 2.6.2x kernels
+DEFAULT_PREFERENCE = "1"
 
 KLIBC_FETCHDIR = "1.5"