Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 02/10] eglibc-package: don't fail without localedef/gconv
Date: Wed, 20 Jul 2011 23:06:19 +0200	[thread overview]
Message-ID: <cd4a85ccaa27bdd77ad06d9300ac71bd6b27e36d.1311195893.git.Martin.Jansa@gmail.com> (raw)
In-Reply-To: <7ac4de095ea2d0543c8c665e2cfd1be131781e8c.1311195893.git.Martin.Jansa@gmail.com>
In-Reply-To: <cover.1311195893.git.Martin.Jansa@gmail.com>

* in some cases we don't have localedef/gconv built
  ie when DISTRO_FEATURES lacks one of libc-charsets, libc-locales, libc-locale-code
  then is better ignore localedef/gconv instead of do_install_locale
  failing like in this bugreport:
  http://bugzilla.yoctoproject.org/show_bug.cgi?id=1209

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index faf68f7..9e71150 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -98,8 +98,12 @@ do_install_locale () {
 	if [ "${base_libdir}" != "${libdir}" ]; then
 		cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
 	fi
-	mv ${D}${bindir}/localedef ${dest}${bindir}
-	mv ${D}${libdir}/gconv ${dest}${libdir}
+	if [ -f ${D}${bindir}/localedef ]; then
+		mv -f ${D}${bindir}/localedef ${dest}${bindir}
+	fi
+	if [ -f ${D}${libdir}/gconv ]; then
+		mv -f ${D}${libdir}/gconv ${dest}${libdir}
+	fi
 	cp -fpPR ${D}${libdir}/* ${dest}${libdir}
         mv ${D}${datadir}/i18n ${dest}${datadir}
 	cp -fpPR ${D}${datadir}/* ${dest}${datadir}
-- 
1.7.6




  parent reply	other threads:[~2011-07-20 21:10 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-20 21:06 [PATCH 00/10] Small fixes Martin Jansa
2011-07-20 21:06 ` [PATCH 01/10] tcmode-default: set preferred version also for (e)glibc-locale Martin Jansa
2011-07-20 21:06 ` Martin Jansa [this message]
2011-08-26 10:12   ` [PATCH 02/10] eglibc-package: don't fail without localedef/gconv Phil Blundell
2011-08-26 11:31     ` Martin Jansa
2011-08-26 11:41       ` [PATCH] eglibc: fix gconv packaging after 5486cac29db6e67051fff7637a0abc9aeab661e5 Martin Jansa
2011-08-29 13:09         ` Richard Purdie
2011-07-20 21:06 ` [PATCH 03/10] intltool: inherit perlnative Martin Jansa
2011-07-21  5:35   ` Frans Meulenbroeks
2011-07-20 21:06 ` [PATCH 04/10] polkit: " Martin Jansa
2011-07-20 21:14   ` Phil Blundell
2011-07-20 21:06 ` [PATCH 05/10] shared-mime-info: " Martin Jansa
2011-07-20 21:06 ` [PATCH 06/10] xkeyboard-config: " Martin Jansa
2011-07-20 21:06 ` [PATCH 07/10] avahi: " Martin Jansa
2011-07-20 21:06 ` [PATCH 08/10] vte: " Martin Jansa
2011-07-20 21:06 ` [PATCH 09/10] python: save Makefile.sysroot in do_compile Martin Jansa
2011-07-20 21:06 ` [PATCH 10/10] python: add patch to fix cross compilation on host with linux-3.0 Martin Jansa
2011-07-20 22:02 ` [PATCH 00/10] Small fixes Tom Rini
2011-07-21  2:03   ` Saul Wold
2011-07-21  0:18 ` Khem Raj
2011-07-21  0:54   ` Tom Rini
2011-07-21  6:11     ` Martin Jansa
2011-07-21  9:39       ` Richard Purdie
2011-07-21 16:44         ` Khem Raj
2011-07-21 21:54           ` Richard Purdie
2011-07-21 14:28       ` Tom Rini
2011-07-21 14:53         ` Martin Jansa
2011-07-21 15:35           ` Tom Rini
2011-07-22 15:32 ` Saul Wold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cd4a85ccaa27bdd77ad06d9300ac71bd6b27e36d.1311195893.git.Martin.Jansa@gmail.com \
    --to=martin.jansa@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox