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>

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 5308bb944fa881228e547583d04666495de3ad65..adda5e9804162053854a8dec532228715cdd8db3 100644 (file)
--- 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 1a69bdcaffee55d7895727c3e30e44de387f7d2f..a71c4d400dde7d4dac3f6f3352819de72e04ad59 100644 (file)
--- 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 f3824485fa4330069e2a2e321fae1442e81db69c..3b19e7ba72f4b107da9df6925f57868f7eca2089 100644 (file)
--- 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"