summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-07-19 18:51:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-21 10:59:18 +0100
commitdda8265b4b77473af0d8335425ccdf049113c31b (patch)
treec58952fd58cd8a58612ffa1d52b0a9f7808095a3
parentb6cba4732c1363da6f1f9bc00487440c7e7a681b (diff)
downloadpoky-dda8265b4b77473af0d8335425ccdf049113c31b.tar.gz
eglibc-package: don't fail without localedef/gconv
* 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 (From OE-Core rev: 5486cac29db6e67051fff7637a0abc9aeab661e5) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc8
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 faf68f70b3..9e71150ca2 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -98,8 +98,12 @@ do_install_locale () {
98 if [ "${base_libdir}" != "${libdir}" ]; then 98 if [ "${base_libdir}" != "${libdir}" ]; then
99 cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} 99 cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
100 fi 100 fi
101 mv ${D}${bindir}/localedef ${dest}${bindir} 101 if [ -f ${D}${bindir}/localedef ]; then
102 mv ${D}${libdir}/gconv ${dest}${libdir} 102 mv -f ${D}${bindir}/localedef ${dest}${bindir}
103 fi
104 if [ -f ${D}${libdir}/gconv ]; then
105 mv -f ${D}${libdir}/gconv ${dest}${libdir}
106 fi
103 cp -fpPR ${D}${libdir}/* ${dest}${libdir} 107 cp -fpPR ${D}${libdir}/* ${dest}${libdir}
104 mv ${D}${datadir}/i18n ${dest}${datadir} 108 mv ${D}${datadir}/i18n ${dest}${datadir}
105 cp -fpPR ${D}${datadir}/* ${dest}${datadir} 109 cp -fpPR ${D}${datadir}/* ${dest}${datadir}