diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2011-08-26 13:41:18 +0200 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-08-26 12:34:03 -0700 |
| commit | feaf1bab56138cc1bc998a4201a60202a5b8cd28 (patch) | |
| tree | 432dbf14b61b05a5d36feb7c57a7936dca153ccc /meta | |
| parent | 477fc6e2fc034c68a250005461774bc8ecf91a52 (diff) | |
| download | openembedded-core-feaf1bab56138cc1bc998a4201a60202a5b8cd28.tar.gz openembedded-core-feaf1bab56138cc1bc998a4201a60202a5b8cd28.tar.bz2 openembedded-core-feaf1bab56138cc1bc998a4201a60202a5b8cd28.zip | |
eglibc: fix gconv packaging after 5486cac29db6e67051fff7637a0abc9aeab661e5
* gconv is directory so test -f was always false as reported by Phil Blundell in
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/008973.html
* -e used also for localedef which is file, just to be more consistent
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.12.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 5308bb944f..adda5e9804 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -100,10 +100,10 @@ do_install_locale () { if [ "${base_libdir}" != "${libdir}" ]; then cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} fi - if [ -f ${D}${bindir}/localedef ]; then + if [ -e ${D}${bindir}/localedef ]; then mv -f ${D}${bindir}/localedef ${dest}${bindir} fi - if [ -f ${D}${libdir}/gconv ]; then + if [ -e ${D}${libdir}/gconv ]; then mv -f ${D}${libdir}/gconv ${dest}${libdir} fi cp -fpPR ${D}${libdir}/* ${dest}${libdir} diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 1a69bdcaff..a71c4d400d 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r22" +PR = "r23" SRCREV = "14158" diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index f3824485fa..3b19e7ba72 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "14157" DEPENDS += "gperf-native" -PR = "r13" +PR = "r14" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" |