[oe-commits] Andrea Adami : klibc: bump to 1.5.15+1.5.16

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4a8053b1e522a31ad7e008c9dac723998bd62491
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4a8053b1e522a31ad7e008c9dac723998bd62491

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Sun May 30 17:56:55 2010 +0200

klibc: bump to 1.5.15+1.5.16

* tested on arm with 2.6.26 and 2.6.33, 2.6.34 kernels

---

 recipes/klibc/klibc_1.5.15+1.5.16.bb  |    2 +-
 recipes/klibc/klibc_1.5.15+1.5.16.inc |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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 4b299f2..694bf58 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 f638e14..630ee45 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"