[oe-commits] : Get the latest changes for uclibc-nptl branch. Compilation fix needed when

OE GIT Trial gittrial at amethyst.openembedded.net
Thu Sep 18 06:51:25 UTC 2008


Module: OE.dev
Branch: master
Commit: 78707ed7a42d16a045f2278fecf68952e7584479
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=78707ed7a42d16a045f2278fecf68952e7584479

Author:  <khem at openembedded.org>
Date:   Thu Sep 18 06:29:16 2008 +0000

Get the latest changes for uclibc-nptl branch. Compilation fix needed when
using dash shell. Some tab/space formatting changes in the recipes.

---

 conf/distro/include/sane-srcrevs.inc |   11 +++++------
 packages/uclibc/uclibc_nptl.bb       |    4 ++--
 packages/uclibc/uclibc_svn.bb        |   18 +++++++++---------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2ca4762..eb2195d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,8 +15,8 @@ SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
 SRCREV_pn-assassin ?= "93"
 SRCREV_pn-bfin-uclibc ?= "1857"
-SRCREV_pn-uclibc ?= "23129"
-SRCREV_pn-uclibc-initial ?= "23129"
+SRCREV_pn-uclibc ?= "23421"
+SRCREV_pn-uclibc-initial ?= "23421"
 SRCREV_pn-clutter-box2d = "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
@@ -31,8 +31,8 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "277"
 SRCREV_pn-diversity-nav ?= "340"
 SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "6625"
-SRCREV_pn-eglibc-initial ?= "6625"
+SRCREV_pn-eglibc ?= "6937"
+SRCREV_pn-eglibc-initial ?= "6937"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
@@ -93,7 +93,7 @@ SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "27380"
+SRCREV_pn-mplayer ?= "27047"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-navit ?= "1096"
@@ -172,7 +172,6 @@ SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-tichy ?= "168"
-SRCREV_pn-tidy ?= "242"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb
index b9b1722..e154b23 100644
--- a/packages/uclibc/uclibc_nptl.bb
+++ b/packages/uclibc/uclibc_nptl.bb
@@ -8,7 +8,7 @@
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 #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 e536424..a294519 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 = "r15"
+PR = "r16"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
@@ -25,14 +25,14 @@ 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://unistd_arm.patch;patch=1 \
+			file://arm-linuxthreads.patch;patch=1 \
+			file://linuxthreads-changes.patch;patch=1 \
+			file://uclibc_mathc99.patch;patch=1 \
            "
 
 S = "${WORKDIR}/uClibc"





More information about the Openembedded-commits mailing list