From e0c2dd275827a4b37b8116d0f0119333638461af Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 20 Aug 2013 22:45:23 -0700 Subject: eglibc: Update SRC_URI and fix unpackaged empty dir eglibc 2.18 has now been branched out so point to new tarballs Signed-off-by: Khem Raj Signed-off-by: Saul Wold --- meta/recipes-core/eglibc/cross-localedef-native_2.18.bb | 6 +++--- meta/recipes-core/eglibc/eglibc-package.inc | 4 ++++ meta/recipes-core/eglibc/eglibc_2.18.bb | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/eglibc') 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 # pick up an eglibc patch FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}" -SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \ +SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \ file://fix_for_centos_5.8.patch;patchdir=.. \ " -SRC_URI[md5sum] = "8c83078851c44089a019c626d51c51bb" -SRC_URI[sha256sum] = "ecd3167d7d417c05b10ea7ab8e3acbc05f4bc2b389b6fae9c186bc0fd34c3ff1" +SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" +SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" S = "${WORKDIR}/eglibc-${PV}/localedef" 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 () { rm -f ${D}${sysconfdir}/localtime rm -rf ${D}${localstatedir} + # remove empty eglibc dir + if [ -d ${D}${libdir}/eglibc ]; then + rmdir ${D}${libdir}/eglibc + fi oe_multilib_header bits/syscall.h 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 DEPENDS += "gperf-native kconfig-frontends-native" -SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \ +SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23787.tar.bz2 \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ file://IO-acquire-lock-fix.patch \ file://mips-rld-map-check.patch \ @@ -27,8 +27,8 @@ SRC_URI = "http://sakrah.dontexist.org/files/eglibc-${PV}-svnr23532.tar.bz2 \ file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ file://fix-tibetian-locales.patch \ " -SRC_URI[md5sum] = "8c83078851c44089a019c626d51c51bb" -SRC_URI[sha256sum] = "ecd3167d7d417c05b10ea7ab8e3acbc05f4bc2b389b6fae9c186bc0fd34c3ff1" +SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" +SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ -- cgit 1.2.3-korg