On Fri, Oct 1, 2010 at 7:10 AM, Tom Rini <[email protected]> wrote: > We want to get zoneinfo from the tzdata package. > > Signed-off-by: Tom Rini <[email protected]>
I removed it accidently. Thanks for re-fixing. Acked-by: Khem Raj <[email protected]> > --- > classes/glibc-package.bbclass | 2 +- > recipes/eglibc/eglibc-package.bbclass | 2 +- > recipes/eglibc/eglibc.inc | 2 +- > recipes/glibc/glibc-package.inc | 1 + > recipes/glibc/glibc.inc | 2 +- > 5 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass > index 36424d5..239317f 100644 > --- a/classes/glibc-package.bbclass > +++ b/classes/glibc-package.bbclass > @@ -21,7 +21,7 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* > ${base_libdir}/libcrypt-*.so ${ba > # The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc > # Solution: Make them both the same thing, then it doesn't matter > > -glibcfiles = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo > $...@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', > d)}" > +glibcfiles = "${libc_baselibs} ${libexecdir}/* > $...@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', > d)}" > glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ > ${base_bindir}/.debug ${base_sbindir}/.debug > ${base_libdir}/.debug \ > ${libdir}/gconv/.debug ${libexecdir}/*/.debug" > diff --git a/recipes/eglibc/eglibc-package.bbclass > b/recipes/eglibc/eglibc-package.bbclass > index 06d91be..5871be0 100644 > --- a/recipes/eglibc/eglibc-package.bbclass > +++ b/recipes/eglibc/eglibc-package.bbclass > @@ -62,7 +62,7 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* > ${base_libdir}/libcrypt-*.so ${ba > # The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc > # Solution: Make them both the same thing, then it doesn't matter > > -eglibcfiles = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo > $...@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', > d)}" > +eglibcfiles = "${libc_baselibs} ${libexecdir}/* > $...@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', > d)}" > eglibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ > ${base_bindir}/.debug ${base_sbindir}/.debug > ${base_libdir}/.debug \ > ${libdir}/gconv/.debug ${libexecdir}/*/.debug" > diff --git a/recipes/eglibc/eglibc.inc b/recipes/eglibc/eglibc.inc > index 2e215c5..a68f343 100644 > --- a/recipes/eglibc/eglibc.inc > +++ b/recipes/eglibc/eglibc.inc > @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.eglibc.org/home"; > SECTION = "libs" > PRIORITY = "required" > LICENSE = "LGPL" > -INC_PR = "r13" > +INC_PR = "r14" > # nptl needs unwind support in gcc, which can't be built without glibc. > DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers" > #this leads to circular deps, so lets not add it yet > diff --git a/recipes/glibc/glibc-package.inc b/recipes/glibc/glibc-package.inc > index 2e9474d..0b263bb 100644 > --- a/recipes/glibc/glibc-package.inc > +++ b/recipes/glibc/glibc-package.inc > @@ -60,6 +60,7 @@ do_install() { > mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED > done > rm -f ${D}{sysconfdir}/rpc > + rm -rf ${D}${datadir}/zoneinfo > install -d ${D}${sysconfdir}/init.d > install -m 0644 ${S}/nscd/nscd.conf ${D}${sysconfdir}/ > install ${S}/nscd/nscd.init ${D}${sysconfdir}/init.d/nscd > diff --git a/recipes/glibc/glibc.inc b/recipes/glibc/glibc.inc > index 643ebd3..f3c0c08 100644 > --- a/recipes/glibc/glibc.inc > +++ b/recipes/glibc/glibc.inc > @@ -13,7 +13,7 @@ PROVIDES += "virtual/libintl virtual/libiconv" > COMPATIBLE_TARGET_SYS ?= "(?!nios2)" > > # INC_PR for glibc.inc, glibc-initial.inc and glibc-stage.inc > -INC_PR = "r36" > +INC_PR = "r37" > > inherit autotools > > -- > 1.6.3.3 > > _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
