summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-08-26 13:41:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-29 13:48:06 +0100
commite4ebecd065651b0d7a500d122f261b12d1615360 (patch)
tree03b344a17cf1b56d78a7d039335fa69acae2c615 /meta
parent7d017c354aa460deba2c55c87fa3e4ec8b7b704e (diff)
downloadpoky-e4ebecd065651b0d7a500d122f261b12d1615360.tar.gz
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 (From OE-Core rev: feaf1bab56138cc1bc998a4201a60202a5b8cd28) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc4
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
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 () {
100 if [ "${base_libdir}" != "${libdir}" ]; then 100 if [ "${base_libdir}" != "${libdir}" ]; then
101 cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} 101 cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
102 fi 102 fi
103 if [ -f ${D}${bindir}/localedef ]; then 103 if [ -e ${D}${bindir}/localedef ]; then
104 mv -f ${D}${bindir}/localedef ${dest}${bindir} 104 mv -f ${D}${bindir}/localedef ${dest}${bindir}
105 fi 105 fi
106 if [ -f ${D}${libdir}/gconv ]; then 106 if [ -e ${D}${libdir}/gconv ]; then
107 mv -f ${D}${libdir}/gconv ${dest}${libdir} 107 mv -f ${D}${libdir}/gconv ${dest}${libdir}
108 fi 108 fi
109 cp -fpPR ${D}${libdir}/* ${dest}${libdir} 109 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 @@
1require eglibc.inc 1require eglibc.inc
2 2
3DEPENDS += "gperf-native" 3DEPENDS += "gperf-native"
4PR = "r22" 4PR = "r23"
5 5
6SRCREV = "14158" 6SRCREV = "14158"
7 7
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
3SRCREV = "14157" 3SRCREV = "14157"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r13" 6PR = "r14"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_BRANCH="eglibc-2_13"