| Submitter | Saul Wold |
|---|---|
| Date | July 7, 2011, 11:31 p.m. |
| Message ID | <d188228df9d99be77ec2b3becc354a1fc905ab65.1310081443.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/7211/ |
| State | New, archived |
| Headers | show |
Comments
On Jul 7, 2011, at 4:31 PM, Saul Wold <sgw@linux.intel.com> wrote: > [YOCTO #1214] > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > meta/recipes-core/eglibc/eglibc-package.inc | 2 +- > meta/recipes-core/eglibc/eglibc.inc | 2 +- > meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- > meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- > 4 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 1c6626c..f0fac76 100644 > --- a/meta/recipes-core/eglibc/eglibc-package.inc > +++ b/meta/recipes-core/eglibc/eglibc-package.inc > @@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" > FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" > FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" > RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" > -EDEPENDS_eglibc-utils = "libsotruss" > +RDEPENDS_eglibc-utils += "libsotruss bash" While typo fix is ok why do we need dependency on bash ? If it is for ldd then there is already a fix to free it from bashism We should use that > FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" > FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" > RPROVIDES_eglibc-dev += "libc-dev" > diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc > index 74afb9d..058d58e 100644 > --- a/meta/recipes-core/eglibc/eglibc.inc > +++ b/meta/recipes-core/eglibc/eglibc.inc > @@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ > # 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 > -#RDEPENDS_ldd += " bash" > +RDEPENDS_ldd += " bash" > # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this > #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" > PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" > diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb > index 85d58fa..fd7b485 100644 > --- 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 = "r18" > +PR = "r19" > > SRCREV = "14158" > > diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb > index 7986131..be65787 100644 > --- a/meta/recipes-core/eglibc/eglibc_2.13.bb > +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb > @@ -4,7 +4,7 @@ SRCREV = "14157" > > DEPENDS += "gperf-native" > FILESPATHPKG =. "eglibc-svn:" > -PR = "r5" > +PR = "r6" > PR_append = "+svnr${SRCPV}" > > EGLIBC_BRANCH="eglibc-2_13" > -- > 1.7.3.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On 07/07/2011 05:59 PM, Khem Raj wrote: > > > On Jul 7, 2011, at 4:31 PM, Saul Wold<sgw@linux.intel.com> wrote: > >> [YOCTO #1214] >> >> Signed-off-by: Saul Wold<sgw@linux.intel.com> >> --- >> meta/recipes-core/eglibc/eglibc-package.inc | 2 +- >> meta/recipes-core/eglibc/eglibc.inc | 2 +- >> meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- >> meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- >> 4 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 1c6626c..f0fac76 100644 >> --- a/meta/recipes-core/eglibc/eglibc-package.inc >> +++ b/meta/recipes-core/eglibc/eglibc-package.inc >> @@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" >> FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" >> FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" >> RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" >> -EDEPENDS_eglibc-utils = "libsotruss" >> +RDEPENDS_eglibc-utils += "libsotruss bash" > > While typo fix is ok why do we need dependency on bash ? > If it is for ldd then there is already a fix to free it from bashism > We should use that > Actually it's for xtrace and tzselect which are part of eglibc-utils and are scripts that use /bin/bash. Where's the fix for ldd? I don't think its part of eglibc currently. Sau! >> FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" >> FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" >> RPROVIDES_eglibc-dev += "libc-dev" >> diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc >> index 74afb9d..058d58e 100644 >> --- a/meta/recipes-core/eglibc/eglibc.inc >> +++ b/meta/recipes-core/eglibc/eglibc.inc >> @@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ >> # 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 >> -#RDEPENDS_ldd += " bash" >> +RDEPENDS_ldd += " bash" >> # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this >> #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" >> PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" >> diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb >> index 85d58fa..fd7b485 100644 >> --- 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 = "r18" >> +PR = "r19" >> >> SRCREV = "14158" >> >> diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb >> index 7986131..be65787 100644 >> --- a/meta/recipes-core/eglibc/eglibc_2.13.bb >> +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb >> @@ -4,7 +4,7 @@ SRCREV = "14157" >> >> DEPENDS += "gperf-native" >> FILESPATHPKG =. "eglibc-svn:" >> -PR = "r5" >> +PR = "r6" >> PR_append = "+svnr${SRCPV}" >> >> EGLIBC_BRANCH="eglibc-2_13" >> -- >> 1.7.3.4 >> >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
On 07/07/2011 06:15 PM, Saul Wold wrote: > On 07/07/2011 05:59 PM, Khem Raj wrote: >> >> >> On Jul 7, 2011, at 4:31 PM, Saul Wold<sgw@linux.intel.com> wrote: >> >>> [YOCTO #1214] >>> >>> Signed-off-by: Saul Wold<sgw@linux.intel.com> >>> --- >>> meta/recipes-core/eglibc/eglibc-package.inc | 2 +- >>> meta/recipes-core/eglibc/eglibc.inc | 2 +- >>> meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- >>> meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- >>> 4 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 1c6626c..f0fac76 100644 >>> --- a/meta/recipes-core/eglibc/eglibc-package.inc >>> +++ b/meta/recipes-core/eglibc/eglibc-package.inc >>> @@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" >>> FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" >>> FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" >>> RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" >>> -EDEPENDS_eglibc-utils = "libsotruss" >>> +RDEPENDS_eglibc-utils += "libsotruss bash" >> >> While typo fix is ok why do we need dependency on bash ? >> If it is for ldd then there is already a fix to free it from bashism >> We should use that >> > Actually it's for xtrace and tzselect which are part of eglibc-utils and > are scripts that use /bin/bash. hmm I see, see if it can be unbashed if not then the dep is ok. > > Where's the fix for ldd? I don't think its part of eglibc currently. 0a831e2cd1c27d30cd76ddada9a44a703ab60f41 in oe.dev > > Sau! > >>> FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" >>> FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" >>> RPROVIDES_eglibc-dev += "libc-dev" >>> diff --git a/meta/recipes-core/eglibc/eglibc.inc >>> b/meta/recipes-core/eglibc/eglibc.inc >>> index 74afb9d..058d58e 100644 >>> --- a/meta/recipes-core/eglibc/eglibc.inc >>> +++ b/meta/recipes-core/eglibc/eglibc.inc >>> @@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ >>> # 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 >>> -#RDEPENDS_ldd += " bash" >>> +RDEPENDS_ldd += " bash" >>> # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect >>> this >>> #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" >>> PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" >>> diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb >>> b/meta/recipes-core/eglibc/eglibc_2.12.bb >>> index 85d58fa..fd7b485 100644 >>> --- 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 = "r18" >>> +PR = "r19" >>> >>> SRCREV = "14158" >>> >>> diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb >>> b/meta/recipes-core/eglibc/eglibc_2.13.bb >>> index 7986131..be65787 100644 >>> --- a/meta/recipes-core/eglibc/eglibc_2.13.bb >>> +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb >>> @@ -4,7 +4,7 @@ SRCREV = "14157" >>> >>> DEPENDS += "gperf-native" >>> FILESPATHPKG =. "eglibc-svn:" >>> -PR = "r5" >>> +PR = "r6" >>> PR_append = "+svnr${SRCPV}" >>> >>> EGLIBC_BRANCH="eglibc-2_13" >>> -- >>> 1.7.3.4 >>> >>> >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
2011/7/8 Saul Wold <sgw@linux.intel.com> > [YOCTO #1214] > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > meta/recipes-core/eglibc/eglibc-package.inc | 2 +- > meta/recipes-core/eglibc/eglibc.inc | 2 +- > meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- > meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- > 4 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 1c6626c..f0fac76 100644 > --- a/meta/recipes-core/eglibc/eglibc-package.inc > +++ b/meta/recipes-core/eglibc/eglibc-package.inc > @@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" > FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" > FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" > RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" > -EDEPENDS_eglibc-utils = "libsotruss" > +RDEPENDS_eglibc-utils += "libsotruss bash" > FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" > FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" > RPROVIDES_eglibc-dev += "libc-dev" > diff --git a/meta/recipes-core/eglibc/eglibc.inc > b/meta/recipes-core/eglibc/eglibc.inc > index 74afb9d..058d58e 100644 > --- a/meta/recipes-core/eglibc/eglibc.inc > +++ b/meta/recipes-core/eglibc/eglibc.inc > @@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ > # 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 > -#RDEPENDS_ldd += " bash" > +RDEPENDS_ldd += " bash" > Ah ok, now see that this is only for ldd. In that case the commit message is misleading. (and probably also not conformant with the commit message policy). Frans > # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this > #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" > PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" > diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bbb/meta/recipes-core/eglibc/ > eglibc_2.12.bb > index 85d58fa..fd7b485 100644 > --- 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 = "r18" > +PR = "r19" > > SRCREV = "14158" > > diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bbb/meta/recipes-core/eglibc/ > eglibc_2.13.bb > index 7986131..be65787 100644 > --- a/meta/recipes-core/eglibc/eglibc_2.13.bb > +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb > @@ -4,7 +4,7 @@ SRCREV = "14157" > > DEPENDS += "gperf-native" > FILESPATHPKG =. "eglibc-svn:" > -PR = "r5" > +PR = "r6" > PR_append = "+svnr${SRCPV}" > > EGLIBC_BRANCH="eglibc-2_13" > -- > 1.7.3.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
Op 8 jul. 2011 om 07:53 heeft Frans Meulenbroeks <fransmeulenbroeks@gmail.com> het volgende geschreven: > > > 2011/7/8 Saul Wold <sgw@linux.intel.com> > [YOCTO #1214] > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > meta/recipes-core/eglibc/eglibc-package.inc | 2 +- > meta/recipes-core/eglibc/eglibc.inc | 2 +- > meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- > meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- > 4 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 1c6626c..f0fac76 100644 > --- a/meta/recipes-core/eglibc/eglibc-package.inc > +++ b/meta/recipes-core/eglibc/eglibc-package.inc > @@ -69,7 +69,7 @@ FILES_eglibc-utils ="${bindir}/* ${sbindir}/*" > FILES_${PN}-dbg +="${libexecdir}/*/.debug ${libdir}/audit/.debug" > FILES_catchsegv${PKGSUFFIX} ="${bindir}/catchsegv" > RDEPENDS_catchsegv${PKGSUFFIX} ="libsegfault" > -EDEPENDS_eglibc-utils ="libsotruss" > +RDEPENDS_eglibc-utils +="libsotruss bash" > FILES_eglibc-pcprofile ="${base_libdir}/libpcprofile.so" > FILES_eglibc-thread-db${PKGSUFFIX} ="${base_libdir}/libthread_db*" > RPROVIDES_eglibc-dev +="libc-dev" > diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc > index 74afb9d..058d58e 100644 > --- a/meta/recipes-core/eglibc/eglibc.inc > +++ b/meta/recipes-core/eglibc/eglibc.inc > @@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend =" \ > # 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 > -#RDEPENDS_ldd +=" bash" > +RDEPENDS_ldd +=" bash" > > Ah ok, now see that this is only for ldd. > In that case the commit message is misleading. (and probably also not conformant with the commit message policy). > there's an ldd-unbash patch in . dev > Frans > > # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this > #RDEPENDS_${PN} +="${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" > PROVIDES ="virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" > diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb > index 85d58fa..fd7b485 100644 > --- 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 ="r18" > +PR ="r19" > > SRCREV ="14158" > > diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb > index 7986131..be65787 100644 > --- a/meta/recipes-core/eglibc/eglibc_2.13.bb > +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb > @@ -4,7 +4,7 @@ SRCREV ="14157" > > DEPENDS +="gperf-native" > FILESPATHPKG =. "eglibc-svn:" > -PR ="r5" > +PR ="r6" > PR_append ="+svnr${SRCPV}" > > EGLIBC_BRANCH="eglibc-2_13" > -- > 1.7.3.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
2011/7/8 Koen Kooi <koen@dominion.thruhere.net> > > > Op 8 jul. 2011 om 07:53 heeft Frans Meulenbroeks < > fransmeulenbroeks@gmail.com> het volgende geschreven: > > >> -#RDEPENDS_ldd +=" bash" >> +RDEPENDS_ldd +=" bash" >> > > Ah ok, now see that this is only for ldd. > In that case the commit message is misleading. (and probably also not > conformant with the commit message policy). > > > there's an ldd-unbash patch in . dev > > > Seems to me that that is a better alternative then Frans
On Thu, 2011-07-07 at 22:27 -0700, Khem Raj wrote: > On 07/07/2011 06:15 PM, Saul Wold wrote: > > On 07/07/2011 05:59 PM, Khem Raj wrote: > >> While typo fix is ok why do we need dependency on bash ? > >> If it is for ldd then there is already a fix to free it from bashism > >> We should use that > > > > Where's the fix for ldd? I don't think its part of eglibc currently. > > 0a831e2cd1c27d30cd76ddada9a44a703ab60f41 in oe.dev As we discussed on IRC the other day, that patch is not really a complete fix. All it does is change the #!/bin/bash to #!/bin/sh without addressing the parts of the script that actually use bash-specific syntax. In particular there are quite a lot of places that use the $"string" gettext shorthand. p.
Patch
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 1c6626c..f0fac76 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -69,7 +69,7 @@ FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" -EDEPENDS_eglibc-utils = "libsotruss" +RDEPENDS_eglibc-utils += "libsotruss bash" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" RPROVIDES_eglibc-dev += "libc-dev" diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc index 74afb9d..058d58e 100644 --- a/meta/recipes-core/eglibc/eglibc.inc +++ b/meta/recipes-core/eglibc/eglibc.inc @@ -22,7 +22,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ # 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 -#RDEPENDS_ldd += " bash" +RDEPENDS_ldd += " bash" # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this #RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 85d58fa..fd7b485 100644 --- 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 = "r18" +PR = "r19" SRCREV = "14158" diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 7986131..be65787 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -4,7 +4,7 @@ SRCREV = "14157" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r5" +PR = "r6" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13"
[YOCTO #1214] Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- meta/recipes-core/eglibc/eglibc.inc | 2 +- meta/recipes-core/eglibc/eglibc_2.12.bb | 2 +- meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)