uclibc: Convert eligible uclibc recipes to use git instead of svn.

uclibc has changed its SCM system to git. We need
to adjust the recipes to fetch from uclibc git

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b6da1cc1e89daa1e4e8c3f2b6f954a39efe0b4f9..e8d8c80b3f7b5e4b814eb391747bf3025d2481a8 100644 (file)
--- 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/arm-linuxthreads.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/arm/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/arm_fix_alignment.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/armeb/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/dht-walnut/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/efika/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/errno_values.h.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/error_print_progname.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/i386/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/i486/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/i586/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/i686/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/ixp4xx/uClibc.distro
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/ixp4xx/uClibc.machine
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/ldso_hash.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/linuxthreads-changes.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/magicbox/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/mipsel/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/powerpc/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/sh3/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/sh4/uClibc.config
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/thumb-asm-swi.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/thumb-mov-pc-bx.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/uClibc.config
rename to recipes/uclibc/uclibc-git/uClibc.config

diff --git a/recipes/uclibc/uclibc-svn/uClibc.distro b/recipes/uclibc/uclibc-git/uClibc.distro
similarity index 100%
rename from recipes/uclibc/uclibc-svn/uClibc.distro
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/uclibc_enable_log2_test.patch
rename to 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
similarity index 100%
rename from recipes/uclibc/uclibc-svn/uclibc_mathc99.patch
rename to recipes/uclibc/uclibc-git/uclibc_mathc99.patch

diff --git a/recipes/uclibc/uclibc-initial_svn.bb b/recipes/uclibc/uclibc-initial_git.bb
similarity index 97%
rename from recipes/uclibc/uclibc-initial_svn.bb
rename to recipes/uclibc/uclibc-initial_git.bb
index e742fd55fdec7f80846f030229f6ff7ce67ec75c..38b85ef36f06773f6f032c915517d7953623a000 100644 (file)
--- 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 3ddaad4ab6d1f3ebaaa8cd020ebeeb2b3f50af73..39d7f52504dd8d00f5a36604c6d5006aaa5167a0 100644 (file)
--- 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 1337da9b9456a1805a017771933a63e362557661..4d58b8904e0604de3f6de95e83e3ebf952585e2b 100644 (file)
--- 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
similarity index 76%
rename from recipes/uclibc/uclibc_svn.bb
rename to recipes/uclibc/uclibc_git.bb
index d3f09737c88215c1aced5b20f958886d9e7b897b..529c17622c65880655e25aa13385520ca53cf5de 100644 (file)
--- 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 ba46a50933df02a6ae0272d72086933374d6888f..aae486ae91c9bb97886283198dd23a1f1b99efc4 100644 (file)
--- 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"