diff options
| author | Ken Werner <ken.werner@linaro.org> | 2012-02-15 09:49:07 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-21 17:53:13 +0000 |
| commit | e39c6027d5b86eb94ed74e19ef708828fb547082 (patch) | |
| tree | 458321cb8593259ece05e682b694c114ed5a7ef1 /meta/recipes-core | |
| parent | d2c96e22de19a649ff7121e5ea0f95797abba93a (diff) | |
| download | openembedded-core-e39c6027d5b86eb94ed74e19ef708828fb547082.tar.gz openembedded-core-e39c6027d5b86eb94ed74e19ef708828fb547082.tar.bz2 openembedded-core-e39c6027d5b86eb94ed74e19ef708828fb547082.zip | |
Add sanity checks for eglibc locale
Add sanity checks that test for the existance of folders. This allows to use
an external binary toolchain that doesn't have localization support.
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-locale.inc | 20 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 4 |
2 files changed, 18 insertions, 6 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc index b4646fac7e..2e9b4d4059 100644 --- a/meta/recipes-core/eglibc/eglibc-locale.inc +++ b/meta/recipes-core/eglibc/eglibc-locale.inc @@ -72,11 +72,21 @@ LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS do_install () { mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} - cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} - cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir} - cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} - cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} - cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} + if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then + cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir} + fi + if [ -e ${LOCALETREESRC}/${libdir}/locale ]; then + cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir} + fi + if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then + cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir} + fi + if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then + cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir} + fi + if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then + cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir} + fi cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR} } diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 870b95dc87..2a1d939786 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -91,7 +91,9 @@ do_install_locale () { mv -f ${D}${libdir}/gconv ${dest}${libdir} fi cp -fpPR ${D}${libdir}/* ${dest}${libdir} - mv ${D}${datadir}/i18n ${dest}${datadir} + if [ -e ${D}${datadir}/i18n ]; then + mv ${D}${datadir}/i18n ${dest}${datadir} + fi cp -fpPR ${D}${datadir}/* ${dest}${datadir} cp -fpPR ${WORKDIR}/SUPPORTED ${dest} } |