* [PATCH 0/2] Two patches to help new users
@ 2010-11-26 16:48 Joshua Lock
2010-11-26 14:23 ` [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale Joshua Lock
2010-11-26 16:43 ` [PATCH 2/2] sanity.bbclass: Warn people when TERMCMD is set to a non-installed program Joshua Lock
0 siblings, 2 replies; 5+ messages in thread
From: Joshua Lock @ 2010-11-26 16:48 UTC (permalink / raw)
To: poky
Here are a couple of patches to help new users out.
The first documents some extra variables to set in local.conf when changing
GLIBC_GENERATE_LOCALES.
The second helps users ensure they have an appropriate terminal configured for
use in patch failure resolution.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/conf
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/conf
Thanks,
Joshua Lock <josh@linux.intel.com>
---
Joshua Lock (2):
local.conf.sample: Note extra variables required when disabling en_US
locale
sanity.bbclass: Warn people when TERMCMD is set to a non-installed
program
meta/classes/sanity.bbclass | 6 ++++++
meta/conf/local.conf.sample | 14 +++++++++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
--
1.7.3.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale 2010-11-26 16:48 [PATCH 0/2] Two patches to help new users Joshua Lock @ 2010-11-26 14:23 ` Joshua Lock 2010-12-02 19:03 ` Saul Wold 2010-11-26 16:43 ` [PATCH 2/2] sanity.bbclass: Warn people when TERMCMD is set to a non-installed program Joshua Lock 1 sibling, 1 reply; 5+ messages in thread From: Joshua Lock @ 2010-11-26 14:23 UTC (permalink / raw) To: poky 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@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" # Default to not build 32 bit libs on 64 bit systems, comment this # out if that is desired -- 1.7.3.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale 2010-11-26 14:23 ` [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale Joshua Lock @ 2010-12-02 19:03 ` Saul Wold 2010-12-03 13:29 ` Joshua Lock 0 siblings, 1 reply; 5+ messages in thread From: Saul Wold @ 2010-12-02 19:03 UTC (permalink / raw) To: Joshua Lock; +Cc: poky@yoctoproject.org 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@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. Sau! > # Default to not build 32 bit libs on 64 bit systems, comment this > # out if that is desired ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale 2010-12-02 19:03 ` Saul Wold @ 2010-12-03 13:29 ` Joshua Lock 0 siblings, 0 replies; 5+ messages in thread From: Joshua Lock @ 2010-12-03 13:29 UTC (permalink / raw) To: Saul Wold; +Cc: poky@yoctoproject.org 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@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@linux.intel.com> In-Reply-To: <cover.1291382830.git.josh@linux.intel.com> References: <cover.1291382830.git.josh@linux.intel.com> From: Joshua Lock <josh@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@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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] sanity.bbclass: Warn people when TERMCMD is set to a non-installed program 2010-11-26 16:48 [PATCH 0/2] Two patches to help new users Joshua Lock 2010-11-26 14:23 ` [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale Joshua Lock @ 2010-11-26 16:43 ` Joshua Lock 1 sibling, 0 replies; 5+ messages in thread From: Joshua Lock @ 2010-11-26 16:43 UTC (permalink / raw) To: poky We default to gnome-terminal for TERMCMD (and TERMRUNCMD) so should check that this program actually exists during sanity checking. As a corollary document how to change these variables in the local.conf Signed-off-by: Joshua Lock <josh@linux.intel.com> --- meta/classes/sanity.bbclass | 6 ++++++ meta/conf/local.conf.sample | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 7f1f800..e98ca89 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -139,6 +139,12 @@ def check_sanity(e): missing = missing.rstrip(',') messages = messages + "Please install following missing utilities: %s\n" % missing + # Ensure we have the binary for TERMCMD, as when patch application fails the error is fairly intimidating + termcmd = data.getVar("TERMCMD", e.data, True) + term = termcmd.split()[0] + if not check_app_exists(term, e.data): + messages = messages + "The console for use in patch error resolution is not available, please install %s or set TERMCMD and TERMCMDRUN (as documented in local.conf).\n" % term + if os.path.basename(os.readlink('/bin/sh')) == 'dash': messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead (e.g. 'dpkg-reconfigure dash' on an Ubuntu system.\n" diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index 4ba250d..f1421ec 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample @@ -170,3 +170,10 @@ ENABLE_BINARY_LOCALE_GENERATION = "1" # out if that is desired NO32LIBS = "1" +# If you do not use (or have installed) gnome-terminal you will need to +# uncomment these variables and set them to the terminal you wish to use +# when resolving patches which cannot be applied +# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN ARE: +# GNOME, SCREEN, XTERM and KONSOLE +#TERMCMD = "${KONSOLE_TERMCMD}" +#TERMCMDRUN = "${KONSOLE_TERMCMDRUN}" -- 1.7.3.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-03 13:29 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-26 16:48 [PATCH 0/2] Two patches to help new users Joshua Lock 2010-11-26 14:23 ` [PATCH 1/2] local.conf.sample: Note extra variables required when disabling en_US locale Joshua Lock 2010-12-02 19:03 ` Saul Wold 2010-12-03 13:29 ` Joshua Lock 2010-11-26 16:43 ` [PATCH 2/2] sanity.bbclass: Warn people when TERMCMD is set to a non-installed program Joshua Lock
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox