From dda8265b4b77473af0d8335425ccdf049113c31b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 19 Jul 2011 18:51:10 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc-package.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/eglibc') 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 () { 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} -- cgit v1.2.3-54-g00ecf