[oe-commits] Klaus Kurzmann : shr.conf: set default locale for images to en-us

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 01fbc4d455610927a6f737d4c9534498d102b45f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=01fbc4d455610927a6f737d4c9534498d102b45f

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Mon Jun  1 23:41:29 2009 +0200

shr.conf: set default locale for images to en-us

We have to do it before including angstrom-2007-for-openmoko.inc
because it will falsely set it to en-gb.

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/shr.conf         |    5 +++++
 recipes/images/shr-image.inc |    1 -
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index cd9e84a..07bb8fa 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -4,6 +4,11 @@
 #@DESCRIPTION: Linux Distribution Configuration for Mobile Phones
 #-----------------------------------------------------------------------------
 
+# set default locale for images - we have to do that before
+# including angstrom-2007-for-openmoko.inc because otherwise
+# it will be already set to en-gb
+IMAGE_LINGUAS ?= "en-us"
+
 require conf/distro/include/preferred-om-2009-versions.inc
 require conf/distro/include/preferred-om-2008-versions.inc
 require conf/distro/include/angstrom-2007-for-openmoko.inc
diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
index 3c0accf..9bc68ed 100644
--- a/recipes/images/shr-image.inc
+++ b/recipes/images/shr-image.inc
@@ -5,7 +5,6 @@
 PV = "2.0"
 PR = "r2"
 
-IMAGE_LINGUAS ?= "en-us"
 
 DEPENDS += "task-shr-minimal"