[poky] [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale

[Joshua Lock]

On Thu, 2010-12-02 at 11:03 -0800, Saul Wold wrote:
> On 11/26/2010 06:23 AM, Joshua Lock wrote:
> > When changing which locales are generated for libc it may also be neccessary to
> > change IMAGE_LINGUAS and LIMIT_BUILT_LOCALES
> >
> > Signed-off-by: Joshua Lock<josh at linux.intel.com>
> > ---
> >   meta/conf/local.conf.sample |    7 ++++++-
> >   1 files changed, 6 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
> > index fae949c..4ba250d 100644
> > --- a/meta/conf/local.conf.sample
> > +++ b/meta/conf/local.conf.sample
> > @@ -158,8 +158,13 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
> >
> >   # Set GLIBC_GENERATE_LOCALES to the locales you wish to generate should you not
> >   # wish to perform the time-consuming step of generating all LIBC locales.
> > +# NOTE: If removing en_US.UTF-8 you will also need to uncomment, and set
> > +# appropriate values for IMAGE_LINGUAS and LIMIT_BUILT_LOCALES
> >   # WARNING: this may break localisation!
> > -#GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 en_US.UTF-8"
> > +#GLIBC_GENERATE_LOCALES = "en_GB.UTF-8"
> > +# See message above as to whether setting these is required
> > +#IMAGE_LINGUAS ?= "en-gb"
> > +#LIMIT_BUILT_LOCALES ?= "POSIX en_GB"
> >
> Should these LOCALES be en_US, en_GB or BOTH?  I know we have had 
> discussion on this in the past.
> 
> Let's be consistent on this please.

Good catch. I think the GLIBC_GENERATE_LOCALES should be both as it was
before but as the IMAGE_LINGUAS and LIMIT_BUILT_LOCALES only need
changing if en_US.UTF-8 is removed they should not include en_US

Updated patch follows and branch fixed:

>From 6d532f464a897f28da4c7dcb72ddcad0bcc65f6c Mon Sep 17 00:00:00 2001
Message-Id:
<6d532f464a897f28da4c7dcb72ddcad0bcc65f6c.1291382830.git.josh at linux.intel.com>
In-Reply-To: <cover.1291382830.git.josh at linux.intel.com>
References: <cover.1291382830.git.josh at linux.intel.com>
From: Joshua Lock <josh at linux.intel.com>
Date: Fri, 26 Nov 2010 14:23:16 +0000
Subject: [PATCH 1/2] local.conf.sample: Note extra variables required
when disabling en_US locale

When changing which locales are generated for libc it may also be
neccessary to
change IMAGE_LINGUAS and LIMIT_BUILT_LOCALES

Signed-off-by: Joshua Lock <josh at linux.intel.com>
---
 meta/conf/local.conf.sample |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index fae949c..9bff292 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -158,8 +158,13 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
 
 # Set GLIBC_GENERATE_LOCALES to the locales you wish to generate should
you not
 # wish to perform the time-consuming step of generating all LIBC
locales.
+# NOTE: If removing en_US.UTF-8 you will also need to uncomment, and
set
+# appropriate values for IMAGE_LINGUAS and LIMIT_BUILT_LOCALES
 # WARNING: this may break localisation!
 #GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 en_US.UTF-8"
+# See message above as to whether setting these is required
+#IMAGE_LINGUAS ?= "en-gb"
+#LIMIT_BUILT_LOCALES ?= "POSIX en_GB"
 
 # Default to not build 32 bit libs on 64 bit systems, comment this
 # out if that is desired
-- 
1.7.3.2