summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-08-20 22:45:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-22 18:30:05 +0100
commit81f99896fae94f3340d2bf3cce672afd28b38361 (patch)
tree5766881b9b2e9276b4f2490da991d9f45c4c1dc1
parente498471b0fc58fd27af4e493d7f7c5e4d2fc4da7 (diff)
downloadpoky-81f99896fae94f3340d2bf3cce672afd28b38361.tar.gz
eglibc: Update SRC_URI and fix unpackaged empty dir
eglibc 2.18 has now been branched out so point to new tarballs (From OE-Core rev: e0c2dd275827a4b37b8116d0f0119333638461af) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/eglibc/cross-localedef-native_2.18.bb6
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc4
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.18.bb6
3 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb
index 072b807508..62296b5276 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.18.bb
@@ -16,11 +16,11 @@ inherit autotools
16# pick up an eglibc patch 16# pick up an eglibc patch
17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}" 17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
18 18
19SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \ 19SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \
20 file://fix_for_centos_5.8.patch;patchdir=.. \ 20 file://fix_for_centos_5.8.patch;patchdir=.. \
21 " 21 "
22SRC_URI[md5sum] = "8c83078851c44089a019c626d51c51bb" 22SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
23SRC_URI[sha256sum] = "ecd3167d7d417c05b10ea7ab8e3acbc05f4bc2b389b6fae9c186bc0fd34c3ff1" 23SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"
24 24
25S = "${WORKDIR}/eglibc-${PV}/localedef" 25S = "${WORKDIR}/eglibc-${PV}/localedef"
26 26
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index f144273c19..c36d16c0ce 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -74,6 +74,10 @@ do_install_append () {
74 rm -f ${D}${sysconfdir}/localtime 74 rm -f ${D}${sysconfdir}/localtime
75 rm -rf ${D}${localstatedir} 75 rm -rf ${D}${localstatedir}
76 76
77 # remove empty eglibc dir
78 if [ -d ${D}${libdir}/eglibc ]; then
79 rmdir ${D}${libdir}/eglibc
80 fi
77 oe_multilib_header bits/syscall.h 81 oe_multilib_header bits/syscall.h
78 82
79 if [ -f ${D}${bindir}/mtrace ]; then 83 if [ -f ${D}${bindir}/mtrace ]; then
diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb
index 2e1d38077f..17b651fe15 100644
--- a/meta/recipes-core/eglibc/eglibc_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
@@ -2,7 +2,7 @@ require eglibc.inc
2 2
3DEPENDS += "gperf-native kconfig-frontends-native" 3DEPENDS += "gperf-native kconfig-frontends-native"
4 4
5SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \ 5SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \
6 file://eglibc-svn-arm-lowlevellock-include-tls.patch \ 6 file://eglibc-svn-arm-lowlevellock-include-tls.patch \
7 file://IO-acquire-lock-fix.patch \ 7 file://IO-acquire-lock-fix.patch \
8 file://mips-rld-map-check.patch \ 8 file://mips-rld-map-check.patch \
@@ -27,8 +27,8 @@ SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \
27 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ 27 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
28 file://fix-tibetian-locales.patch \ 28 file://fix-tibetian-locales.patch \
29 " 29 "
30SRC_URI[md5sum] = "8c83078851c44089a019c626d51c51bb" 30SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
31SRC_URI[sha256sum] = "ecd3167d7d417c05b10ea7ab8e3acbc05f4bc2b389b6fae9c186bc0fd34c3ff1" 31SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"
32 32
33LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ 33LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
34 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 34 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \