34 files changed, 21 insertions, 19 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b6da1cc1e8..e8d8c80b3f 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -249,8 +249,6 @@ SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96"
 SRCREV_pn-u-boot-bug ?= "8674"
 SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
-SRCREV_pn-uclibc ?= "25712"
-SRCREV_pn-uclibc-initial ?= "25712"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
diff --git a/recipes/uclibc/uclibc-svn/arm-linuxthreads.patch b/recipes/uclibc/uclibc-git/arm-linuxthreads.patch
index e222668a66..e222668a66 100644
--- a/recipes/uclibc/uclibc-svn/arm-linuxthreads.patch
+++ b/recipes/uclibc/uclibc-git/arm-linuxthreads.patch
diff --git a/recipes/uclibc/uclibc-svn/arm/uClibc.config b/recipes/uclibc/uclibc-git/arm/uClibc.config
index 34b0f2137e..34b0f2137e 100644
--- a/recipes/uclibc/uclibc-svn/arm/uClibc.config
+++ b/recipes/uclibc/uclibc-git/arm/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/arm_fix_alignment.patch b/recipes/uclibc/uclibc-git/arm_fix_alignment.patch
index 982afe9a6e..982afe9a6e 100644
--- a/recipes/uclibc/uclibc-svn/arm_fix_alignment.patch
+++ b/recipes/uclibc/uclibc-git/arm_fix_alignment.patch
diff --git a/recipes/uclibc/uclibc-svn/armeb/uClibc.config b/recipes/uclibc/uclibc-git/armeb/uClibc.config
index 5f9fe16afb..5f9fe16afb 100644
--- a/recipes/uclibc/uclibc-svn/armeb/uClibc.config
+++ b/recipes/uclibc/uclibc-git/armeb/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/dht-walnut/uClibc.config b/recipes/uclibc/uclibc-git/dht-walnut/uClibc.config
index 6e606f6be3..6e606f6be3 100644
--- a/recipes/uclibc/uclibc-svn/dht-walnut/uClibc.config
+++ b/recipes/uclibc/uclibc-git/dht-walnut/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/efika/uClibc.config b/recipes/uclibc/uclibc-git/efika/uClibc.config
index 23b221d662..23b221d662 100644
--- a/recipes/uclibc/uclibc-svn/efika/uClibc.config
+++ b/recipes/uclibc/uclibc-git/efika/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/errno_values.h.patch b/recipes/uclibc/uclibc-git/errno_values.h.patch
index a1e39c181b..a1e39c181b 100644
--- a/recipes/uclibc/uclibc-svn/errno_values.h.patch
+++ b/recipes/uclibc/uclibc-git/errno_values.h.patch
diff --git a/recipes/uclibc/uclibc-svn/error_print_progname.patch b/recipes/uclibc/uclibc-git/error_print_progname.patch
index 6c10ec6b3c..6c10ec6b3c 100644
--- a/recipes/uclibc/uclibc-svn/error_print_progname.patch
+++ b/recipes/uclibc/uclibc-git/error_print_progname.patch
diff --git a/recipes/uclibc/uclibc-svn/i386/uClibc.config b/recipes/uclibc/uclibc-git/i386/uClibc.config
index bc6e72debf..bc6e72debf 100644
--- a/recipes/uclibc/uclibc-svn/i386/uClibc.config
+++ b/recipes/uclibc/uclibc-git/i386/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/i486/uClibc.config b/recipes/uclibc/uclibc-git/i486/uClibc.config
index 896d65ab20..896d65ab20 100644
--- a/recipes/uclibc/uclibc-svn/i486/uClibc.config
+++ b/recipes/uclibc/uclibc-git/i486/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/i586/uClibc.config b/recipes/uclibc/uclibc-git/i586/uClibc.config
index d1bf538902..d1bf538902 100644
--- a/recipes/uclibc/uclibc-svn/i586/uClibc.config
+++ b/recipes/uclibc/uclibc-git/i586/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/i686/uClibc.config b/recipes/uclibc/uclibc-git/i686/uClibc.config
index bc6e72debf..bc6e72debf 100644
--- a/recipes/uclibc/uclibc-svn/i686/uClibc.config
+++ b/recipes/uclibc/uclibc-git/i686/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.distro b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.distro
index 7d54119f39..7d54119f39 100644
--- a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.distro
+++ b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.distro
diff --git a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.machine b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.machine
index 77e53bc1a8..77e53bc1a8 100644
--- a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.machine
+++ b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.machine
diff --git a/recipes/uclibc/uclibc-svn/ldso_hash.patch b/recipes/uclibc/uclibc-git/ldso_hash.patch
index 974f564396..974f564396 100644
--- a/recipes/uclibc/uclibc-svn/ldso_hash.patch
+++ b/recipes/uclibc/uclibc-git/ldso_hash.patch
diff --git a/recipes/uclibc/uclibc-svn/linuxthreads-changes.patch b/recipes/uclibc/uclibc-git/linuxthreads-changes.patch
index f6f32cdd29..f6f32cdd29 100644
--- a/recipes/uclibc/uclibc-svn/linuxthreads-changes.patch
+++ b/recipes/uclibc/uclibc-git/linuxthreads-changes.patch
diff --git a/recipes/uclibc/uclibc-svn/magicbox/uClibc.config b/recipes/uclibc/uclibc-git/magicbox/uClibc.config
index 6542d49fd0..6542d49fd0 100644
--- a/recipes/uclibc/uclibc-svn/magicbox/uClibc.config
+++ b/recipes/uclibc/uclibc-git/magicbox/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/mipsel/uClibc.config b/recipes/uclibc/uclibc-git/mipsel/uClibc.config
index 4389c9b8c2..4389c9b8c2 100644
--- a/recipes/uclibc/uclibc-svn/mipsel/uClibc.config
+++ b/recipes/uclibc/uclibc-git/mipsel/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/powerpc/uClibc.config b/recipes/uclibc/uclibc-git/powerpc/uClibc.config
index 8a12c10961..8a12c10961 100644
--- a/recipes/uclibc/uclibc-svn/powerpc/uClibc.config
+++ b/recipes/uclibc/uclibc-git/powerpc/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/sh3/uClibc.config b/recipes/uclibc/uclibc-git/sh3/uClibc.config
index 1e2710715f..1e2710715f 100644
--- a/recipes/uclibc/uclibc-svn/sh3/uClibc.config
+++ b/recipes/uclibc/uclibc-git/sh3/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/sh4/uClibc.config b/recipes/uclibc/uclibc-git/sh4/uClibc.config
index 0b9a3c48b2..0b9a3c48b2 100644
--- a/recipes/uclibc/uclibc-svn/sh4/uClibc.config
+++ b/recipes/uclibc/uclibc-git/sh4/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/thumb-asm-swi.patch b/recipes/uclibc/uclibc-git/thumb-asm-swi.patch
index d09e40b7a3..d09e40b7a3 100644
--- a/recipes/uclibc/uclibc-svn/thumb-asm-swi.patch
+++ b/recipes/uclibc/uclibc-git/thumb-asm-swi.patch
diff --git a/recipes/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch b/recipes/uclibc/uclibc-git/thumb-defined-arm-or-thumb.patch
index 6b73301bf7..6b73301bf7 100644
--- a/recipes/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch
+++ b/recipes/uclibc/uclibc-git/thumb-defined-arm-or-thumb.patch
diff --git a/recipes/uclibc/uclibc-svn/thumb-mov-pc-bx.patch b/recipes/uclibc/uclibc-git/thumb-mov-pc-bx.patch
index 3d493514f8..3d493514f8 100644
--- a/recipes/uclibc/uclibc-svn/thumb-mov-pc-bx.patch
+++ b/recipes/uclibc/uclibc-git/thumb-mov-pc-bx.patch
diff --git a/recipes/uclibc/uclibc-svn/uClibc.config b/recipes/uclibc/uclibc-git/uClibc.config
index e69de29bb2..e69de29bb2 100644
--- a/recipes/uclibc/uclibc-svn/uClibc.config
+++ b/recipes/uclibc/uclibc-git/uClibc.config
diff --git a/recipes/uclibc/uclibc-svn/uClibc.distro b/recipes/uclibc/uclibc-git/uClibc.distro
index 2f5e073ec1..2f5e073ec1 100644
--- a/recipes/uclibc/uclibc-svn/uClibc.distro
+++ b/recipes/uclibc/uclibc-git/uClibc.distro
diff --git a/recipes/uclibc/uclibc-svn/uclibc_enable_log2_test.patch b/recipes/uclibc/uclibc-git/uclibc_enable_log2_test.patch
index f8f3a7d1aa..f8f3a7d1aa 100644
--- a/recipes/uclibc/uclibc-svn/uclibc_enable_log2_test.patch
+++ b/recipes/uclibc/uclibc-git/uclibc_enable_log2_test.patch
diff --git a/recipes/uclibc/uclibc-svn/uclibc_mathc99.patch b/recipes/uclibc/uclibc-git/uclibc_mathc99.patch
index 6fbb11af6b..6fbb11af6b 100644
--- a/recipes/uclibc/uclibc-svn/uclibc_mathc99.patch
+++ b/recipes/uclibc/uclibc-git/uclibc_mathc99.patch
diff --git a/recipes/uclibc/uclibc-initial_svn.bb b/recipes/uclibc/uclibc-initial_git.bb
index e742fd55fd..38b85ef36f 100644
--- a/recipes/uclibc/uclibc-initial_svn.bb
+++ b/recipes/uclibc/uclibc-initial_git.bb
@@ -1,5 +1,5 @@
 SECTION = "base"
-require uclibc_svn.bb
+require uclibc_git.bb
 
 DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb
index 3ddaad4ab6..39d7f52504 100644
--- a/recipes/uclibc/uclibc_0.9.30.1.bb
+++ b/recipes/uclibc/uclibc_0.9.30.1.bb
@@ -8,7 +8,6 @@
 #
 UCLIBC_BASE ?= "0.9.30.1"
 PR = "r3"
-DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
 
diff --git a/recipes/uclibc/uclibc_0.9.30.bb b/recipes/uclibc/uclibc_0.9.30.bb
index 1337da9b94..4d58b8904e 100644
--- a/recipes/uclibc/uclibc_0.9.30.bb
+++ b/recipes/uclibc/uclibc_0.9.30.bb
@@ -8,7 +8,6 @@
 #
 UCLIBC_BASE ?= "0.9.30"
 PR = "r7"
-DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
 
diff --git a/recipes/uclibc/uclibc_svn.bb b/recipes/uclibc/uclibc_git.bb
index d3f09737c8..529c17622c 100644
--- a/recipes/uclibc/uclibc_svn.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -7,9 +7,10 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-PV = "${UCLIBC_BASE}+svnr${SRCREV}"
+SRCREV="b1913a876059949e6c309bafade55e9425ef33fb"
+PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 PR = "r1"
-#DEFAULT_PREFERENCE = "2"
+DEFAULT_PREFERENCE = "1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
@@ -19,13 +20,15 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
 
 #recent versions uclibc require real kernel headers
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILESPATHPKG =. "uclibc-svn:uclibc-${UCLIBC_BASE}:"
+FILESPATHPKG =. "uclibc-git:uclibc-${UCLIBC_BASE}:"
 
 #as stated above, uclibc needs real kernel-headers
 #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
 KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
 
-SRC_URI += "svn://uclibc.org/trunk;module=uClibc \
+SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \
+	${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
+	file://uClibc.config \
 	file://uClibc.machine \
 	file://uClibc.distro \
 	file://uclibc-arm-ftruncate64.patch;patch=1 \
@@ -33,4 +36,4 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \
 	file://uclibc_ldso_use_O0.patch;patch=1 \
 	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
 	"
-S = "${WORKDIR}/uClibc"
+S = "${WORKDIR}/git"
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index ba46a50933..aae486ae91 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -7,7 +7,8 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-PV = "${UCLIBC_BASE}+svnr${SRCREV}"
+SRCREV="10373d3ca64c1ec9c519933454a94b459b8fb4e7"
+PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 PR = "r1"
 #DEFAULT_PREFERENCE = "2"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -25,12 +26,14 @@ FILESPATHPKG =. "uclibc-nptl:uclibc-${UCLIBC_BASE}:"
 #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
 KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
 
-SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl;rev=${SRCREV} \
-            file://uClibc.machine \
-            file://uClibc.distro \
-            file://uclibc-arm-ftruncate64.patch;patch=1 \
-            file://uclibc_ldso_use_O0.patch;patch=1 \
-	    file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
-            "
+SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
+	${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
+	file://uClibc.config \
+	file://uClibc.machine \
+	file://uClibc.distro \
+	file://uclibc-arm-ftruncate64.patch;patch=1 \
+	file://uclibc_ldso_use_O0.patch;patch=1 \
+	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
+	"
 
-S = "${WORKDIR}/uClibc-nptl"
+S = "${WORKDIR}/git"