diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-07-19 18:51:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-21 10:47:18 +0100 |
commit | 5486cac29db6e67051fff7637a0abc9aeab661e5 (patch) | |
tree | 5f5381145730f050a5cf53a4c243dca7d5f70efe | |
parent | 133f7904cb7b5f98bdd260d04ffd4925bff9cff1 (diff) | |
download | openembedded-core-5486cac29db6e67051fff7637a0abc9aeab661e5.tar.gz openembedded-core-5486cac29db6e67051fff7637a0abc9aeab661e5.tar.bz2 openembedded-core-5486cac29db6e67051fff7637a0abc9aeab661e5.tar.xz openembedded-core-5486cac29db6e67051fff7637a0abc9aeab661e5.zip |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | 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 faf68f70b..9e71150ca 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} |