| Submitter | Nitin A Kamble |
|---|---|
| Date | April 26, 2012, 10:53 p.m. |
| Message ID | <385b9b6d43ea3d98d355edc50989d2e0ab488cd7.1335480719.git.nitin.a.kamble@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/26481/ |
| State | New |
| Headers | show |
Comments
On 04/26/2012 03:53 PM, nitin.a.kamble@intel.com wrote: > From: Nitin A Kamble<nitin.a.kamble@intel.com> > > And install it only for nativesdk images > I think this needs to be in the -sdk images also, not just nativesdk. Sau! > This fixes bug: [YOCTO# 2374] > > Signed-off-by: Nitin A Kamble<nitin.a.kamble@intel.com> > --- > meta/recipes-core/eglibc/eglibc-package.inc | 8 +++++++- > meta/recipes-core/eglibc/eglibc_2.13.bb | 2 +- > meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc > index 0db221f..e199901 100644 > --- a/meta/recipes-core/eglibc/eglibc-package.inc > +++ b/meta/recipes-core/eglibc/eglibc-package.inc > @@ -20,11 +20,12 @@ USE_LDCONFIG ?= "1" > PKGSUFFIX = "" > PKGSUFFIX_virtclass-nativesdk = "-nativesdk" > > -PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" > +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-mtrace ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" > > # The ld.so in this eglibc supports the GNU_HASH > RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" > RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" > +RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace" > RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" > RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" > RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" > @@ -48,11 +49,14 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ > ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" > FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" > FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" > +FILES_${PN}-mtrace = "${bindir}/mtrace" > FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" > FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" > FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" > RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" > RDEPENDS_${PN}-utils += "bash" > +RDEPENDS_${PN}-utils_virtclass-nativesdk += "${PN}-mtrace" > +RDEPENDS_${PN}-mtrace += "perl" > FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" > FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" > RPROVIDES_${PN}-dev += "libc-dev" > @@ -68,6 +72,8 @@ SUMMARY_ldd = "print shared library dependencies" > DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." > SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" > DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." > +SUMMARY_${PN}-mtrace = "mtrace utility provided by eglibc" > +DESCRIPTION_${PN}-mtrace = "mtrace utility provided by eglibc" > DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" > > inherit libc-common multilib_header > diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb > index d8a41dc..73cd0aa 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 > SRCREV = "15508" > > DEPENDS += "gperf-native" > -PR = "r26" > +PR = "r27" > PR_append = "+svnr${SRCPV}" > > EGLIBC_BRANCH="eglibc-2_13" > diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb > index 713efc3..f5219d1 100644 > --- a/meta/recipes-core/eglibc/eglibc_2.15.bb > +++ b/meta/recipes-core/eglibc/eglibc_2.15.bb > @@ -3,7 +3,7 @@ require eglibc.inc > SRCREV = "17386" > > DEPENDS += "gperf-native" > -PR = "r6" > +PR = "r7" > PR_append = "+svnr${SRCPV}" > > EGLIBC_BRANCH="eglibc-2_15"
> -----Original Message----- > From: Saul Wold [mailto:sgw@linux.intel.com] > Sent: Friday, April 27, 2012 8:36 AM > To: Patches and discussions about the oe-core layer > Cc: Kamble, Nitin A > Subject: Re: [OE-core] [PATCH 1/2] eglibc: package mtrace separately > > On 04/26/2012 03:53 PM, nitin.a.kamble@intel.com wrote: > > From: Nitin A Kamble<nitin.a.kamble@intel.com> > > > > And install it only for nativesdk images > > > I think this needs to be in the -sdk images also, not just nativesdk. > Saul, mtrace is getting installed on the sdk images also. Nitin
On Fri, 2012-04-27 at 08:36 -0700, Saul Wold wrote: > On 04/26/2012 03:53 PM, nitin.a.kamble@intel.com wrote: > > From: Nitin A Kamble<nitin.a.kamble@intel.com> > > > > And install it only for nativesdk images > > > I think this needs to be in the -sdk images also, not just nativesdk. Why? Do we need mtrace in the nativesdk? I'm not sure why we're adding this. Cheers, Richard
On Fri, 2012-04-27 at 08:36 -0700, Saul Wold wrote: > On 04/26/2012 03:53 PM, nitin.a.kamble@intel.com wrote: > > From: Nitin A Kamble<nitin.a.kamble@intel.com> > > > > And install it only for nativesdk images > > > I think this needs to be in the -sdk images also, not just nativesdk. Why? Do we need mtrace in the nativesdk? I'm not sure why we're adding this. Cheers, Richard
> -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > Richard Purdie > Sent: Friday, April 27, 2012 2:52 PM > To: Patches and discussions about the oe-core layer > Subject: Re: [OE-core] [PATCH 1/2] eglibc: package mtrace separately > > On Fri, 2012-04-27 at 08:36 -0700, Saul Wold wrote: > > On 04/26/2012 03:53 PM, nitin.a.kamble@intel.com wrote: > > > From: Nitin A Kamble<nitin.a.kamble@intel.com> > > > > > > And install it only for nativesdk images > > > > > I think this needs to be in the -sdk images also, not just nativesdk. > > Why? Do we need mtrace in the nativesdk? > > I'm not sure why we're adding this. > This was in response to this bug: https://bugzilla.yoctoproject.org/show_bug.cgi?id=2374 If I understand it correctly, Saul wanted to package mtrace separately to avoid the perl dependency issue on fedora 17. Nitin
On Mon, 2012-04-30 at 15:14 +0000, Kamble, Nitin A wrote: > > > -----Original Message----- > > From: openembedded-core-bounces@lists.openembedded.org > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > > Richard Purdie > > Sent: Friday, April 27, 2012 2:52 PM > > To: Patches and discussions about the oe-core layer > > Subject: Re: [OE-core] [PATCH 1/2] eglibc: package mtrace separately > > > > On Fri, 2012-04-27 at 08:36 -0700, Saul Wold wrote: > > > On 04/26/2012 03:53 PM, nitin.a.kamble@intel.com wrote: > > > > From: Nitin A Kamble<nitin.a.kamble@intel.com> > > > > > > > > And install it only for nativesdk images > > > > > > > I think this needs to be in the -sdk images also, not just nativesdk. > > > > Why? Do we need mtrace in the nativesdk? > > > > I'm not sure why we're adding this. > > > This was in response to this bug: > > https://bugzilla.yoctoproject.org/show_bug.cgi?id=2374 > > If I understand it correctly, Saul wanted to package mtrace separately > to avoid the perl dependency issue on fedora 17. Right, but lets just not install the mtrace package unless people want it. Cheers, Richard
Patch
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 0db221f..e199901 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -20,11 +20,12 @@ USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-mtrace ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-staticdev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" # The ld.so in this eglibc supports the GNU_HASH RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" +RPROVIDES_${PN}-mtrace = "glibc${PKGSUFFIX}-mtrace" RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" RPROVIDES_${PN}-staticdev = "glibc${PKGSUFFIX}-staticdev" @@ -48,11 +49,14 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_${PN}-staticdev_append += "${libdir}/*.a ${base_libdir}/*.a" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*" +FILES_${PN}-mtrace = "${bindir}/mtrace" FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" RDEPENDS_${PN}-utils += "bash" +RDEPENDS_${PN}-utils_virtclass-nativesdk += "${PN}-mtrace" +RDEPENDS_${PN}-mtrace += "perl" FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" RPROVIDES_${PN}-dev += "libc-dev" @@ -68,6 +72,8 @@ SUMMARY_ldd = "print shared library dependencies" DESCRIPTION_ldd = "/usr/bin/ldd prints shared library dependencies for each program or shared library specified on the command line." SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc" DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..." +SUMMARY_${PN}-mtrace = "mtrace utility provided by eglibc" +DESCRIPTION_${PN}-mtrace = "mtrace utility provided by eglibc" DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" inherit libc-common multilib_header diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index d8a41dc..73cd0aa 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 SRCREV = "15508" DEPENDS += "gperf-native" -PR = "r26" +PR = "r27" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb index 713efc3..f5219d1 100644 --- a/meta/recipes-core/eglibc/eglibc_2.15.bb +++ b/meta/recipes-core/eglibc/eglibc_2.15.bb @@ -3,7 +3,7 @@ require eglibc.inc SRCREV = "17386" DEPENDS += "gperf-native" -PR = "r6" +PR = "r7" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_15"