From 988d19888b283c18a72dfa70e3c5bf2451ac361b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 21 Nov 2008 14:16:11 -0800
Subject: sane-srcrevs: Bump eglibc and uclibc to new sane svn revisions
 uclibc-svn: Bump version to 0.9.30 uclibc-nptl: Bump version to 0.9.30
 eglibc-svn: Bump version to eglibc 2.9

---
 conf/distro/include/sane-srcrevs.inc |  8 ++++----
 packages/eglibc/eglibc_svn.bb        |  6 +++---
 packages/uclibc/uclibc_nptl.bb       |  6 +++---
 packages/uclibc/uclibc_svn.bb        | 22 +++++++++++-----------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5a0a15b15f..cbff119e37 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -18,8 +18,6 @@ SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "265"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-bfin-uclibc ?= "1857"
-SRCREV_pn-uclibc ?= "23421"
-SRCREV_pn-uclibc-initial ?= "23421"
 SRCREV_pn-clutter-box2d = "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
@@ -34,8 +32,8 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
 SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "6937"
-SRCREV_pn-eglibc-initial ?= "6937"
+SRCREV_pn-eglibc ?= "7389"
+SRCREV_pn-eglibc-initial ?= "7389"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
@@ -206,6 +204,8 @@ SRCREV_pn-tichy ?= "279"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
+SRCREV_pn-uclibc ?= "24107"
+SRCREV_pn-uclibc-initial ?= "24107"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb
index e23a13b5a2..d3bd7c1f99 100644
--- a/packages/eglibc/eglibc_svn.bb
+++ b/packages/eglibc/eglibc_svn.bb
@@ -2,8 +2,8 @@ require eglibc.inc
 
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
-PV = "2.8+svnr${SRCREV}"
-PR = "r10"
+PV = "2.9+svnr${SRCREV}"
+PR = "r0"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \
@@ -42,7 +42,7 @@ python __anonymous () {
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
                 --without-cvs --disable-profile --disable-debug --without-gd \
                 --enable-clocale=gnu \
-                --enable-add-ons=${GLIBC_ADDONS} \
+                --enable-add-ons=${GLIBC_ADDONS},ports \
                 --with-headers=${STAGING_INCDIR} \
                 --without-selinux \
                 ${GLIBC_EXTRA_OECONF}"
diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb
index 1cebe7b112..dbb25f41f1 100644
--- a/packages/uclibc/uclibc_nptl.bb
+++ b/packages/uclibc/uclibc_nptl.bb
@@ -6,9 +6,9 @@
 # UCLIBC_BASE can be set in a distro file, but whether this works depends
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
-UCLIBC_BASE ?= "0.9.29"
+UCLIBC_BASE ?= "0.9.30"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r3"
+PR = "r0"
 #DEFAULT_PREFERENCE = "2"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
@@ -28,7 +28,7 @@ KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
 SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl \
             file://uClibc.machine \
             file://uClibc.distro \
-			file://uclibc-arm-ftruncate64.patch;patch=1 \
+            file://uclibc-arm-ftruncate64.patch;patch=1 \
             file://arm_fix_alignment.patch;patch=1 \
             "
 
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index 29dca64c2a..f2417f09c0 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -6,9 +6,10 @@
 # UCLIBC_BASE can be set in a distro file, but whether this works depends
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
-UCLIBC_BASE ?= "0.9.29"
+UCLIBC_BASE ?= "0.9.30"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r17"
+PR = "r0"
+#DEFAULT_PREFERENCE = "2"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
@@ -25,14 +26,13 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-svn', '${FILE_DIRNA
 KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
 
 SRC_URI += "svn://uclibc.org/trunk;module=uClibc \
-			file://uClibc.machine \
-			file://uClibc.distro \
-			file://uclibc-arm-ftruncate64.patch;patch=1 \
-			file://arm_fix_alignment.patch;patch=1 \
-			file://unistd_arm.patch;patch=1 \
-			file://arm-linuxthreads.patch;patch=1 \
-			file://linuxthreads-changes.patch;patch=1 \
-			file://uclibc_mathc99.patch;patch=1 \
-           "
+	file://uClibc.machine \
+	file://uClibc.distro \
+	file://uclibc-arm-ftruncate64.patch;patch=1 \
+	file://arm_fix_alignment.patch;patch=1 \
+	file://arm-linuxthreads.patch;patch=1 \
+	file://linuxthreads-changes.patch;patch=1 \
+	file://uclibc_enable_log2_test.patch;patch=1 \
+	"
 
 S = "${WORKDIR}/uClibc"
-- 
cgit v1.2.3