[oe-commits] Khem Raj : uclibc.inc: Point uClibc-locale-030818.arm.tgz to updated url.

[GIT User account]

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

Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Dec 10 12:18:43 2008 -0800

uclibc.inc: Point uClibc-locale-030818.arm.tgz to updated url.
checksums.ini: Add checksum of uClibc-locale-030818.arm.tgz

* in uclibc.inc use inverted condition to set up UCLIBC_HAS_LOCALE config option.
so we enable it based on USE_NLS rather than disabling it when USE_NLS=no
because by default it is not set.

---

 conf/checksums.ini         |    4 ++++
 packages/uclibc/uclibc.inc |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index df8149d..4e15e69 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -19806,6 +19806,10 @@ sha256=ca70501ae859cd86b387bb196908838275b4b06e6f4d692f9aa51b8a633334a7
 md5=e5766e2566e0297adebebbcc0aba1f2d
 sha256=67e7e6b983cd2caa163f177d5196282434ae1e18b7270495cd6c65f5c1549555
 
+[http://wiki.openembedded.net/dl/uclibc-locale/uClibc-locale-030818.arm.tgz]
+md5=fc0b6113f2b333564d3558e241059db8
+sha256=6765f08499079207ba8c4da999d602ca75c384ff5812aa973f27b6a501b3438e
+
 [http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/uClinux-2.4.24-uc0.diff.gz]
 md5=cd8a3b23299305761c5b3b3f81dd017a
 sha256=c409609ce3bdf5bc4c040aa17ec28c6c214695a6aaaa408643edbda704142fcf
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index 722a36c..816e581 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -62,7 +62,7 @@ RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev"
 UCLIBC_LOCALE_FILE = "uClibc-locale-030818.tgz"
 UCLIBC_LOCALE_FILE_arm = "uClibc-locale-030818.arm.tgz"
 UCLIBC_LOCALE_URI = "http://www.uclibc.org/downloads/${UCLIBC_LOCALE_FILE}"
-UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
+UCLIBC_LOCALE_URI_arm = "http://wiki.openembedded.net/dl/uclibc-locale/${UCLIBC_LOCALE_FILE}"
 
 SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
 	   file://uClibc.config"
@@ -93,7 +93,7 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \
 		s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \
 		s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="/lib",; \
 		s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
-		${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \
+		${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][bb.data.getVar("USE_NLS", d, 1) == "yes"]} \
 		${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][bb.data.getVar("TARGET_ARCH", d, 1) == "avr32"]} \
                '