| Submitter | Rich Dubielzig |
|---|---|
| Date | March 8, 2013, 10:07 p.m. |
| Message ID | <1362780455-31958-1-git-send-email-rich.dubielzig@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/45757/ |
| State | New |
| Headers | show |
Comments
On Mar 8, 2013, at 2:07 PM, Rich Dubielzig <rich.dubielzig@windriver.com> wrote: > /var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not > being properly handled by the do_package task in > eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf > is being included in the -utils subpackage. > > Signed-off-by: Rich Dubielzig <rich.dubielzig@windriver.com> > --- > meta/recipes-core/eglibc/eglibc-package.inc | 3 ++- > meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) Could you rebase it on master please ? > > diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc > index 3298dea..d51d943 100644 > --- a/meta/recipes-core/eglibc/eglibc-package.inc > +++ b/meta/recipes-core/eglibc/eglibc-package.inc > @@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ > 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}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" > FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" > FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" > RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" > @@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" > eglibc_package_preprocess () { > rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} > rm -rf ${PKGD}/${libdir}/locale > + rm -rf ${PKGD}/var > } > > diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb > index fe93b4b..b4bf692 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 = "r11" > +PR = "r12" > PR_append = "+svnr${SRCPV}" > > EGLIBC_BRANCH="eglibc-2_15" > -- > 1.7.1 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On Fri, 2013-03-08 at 14:11 -0800, Khem Raj wrote: > On Mar 8, 2013, at 2:07 PM, Rich Dubielzig <rich.dubielzig@windriver.com> wrote: > > > /var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not > > being properly handled by the do_package task in > > eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf > > is being included in the -utils subpackage. > > > > Signed-off-by: Rich Dubielzig <rich.dubielzig@windriver.com> > > --- > > meta/recipes-core/eglibc/eglibc-package.inc | 3 ++- > > meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- > > 2 files changed, 3 insertions(+), 2 deletions(-) > > Could you rebase it on master please ? > > > > > diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc > > index 3298dea..d51d943 100644 > > --- a/meta/recipes-core/eglibc/eglibc-package.inc > > +++ b/meta/recipes-core/eglibc/eglibc-package.inc > > @@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ > > 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}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" > > FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" > > FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" > > RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" > > @@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" > > eglibc_package_preprocess () { > > rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} > > rm -rf ${PKGD}/${libdir}/locale > > + rm -rf ${PKGD}/var Isn't this ${localstatesir} ? And as Khem said, fixes need to be considered for master first, or at least mention this is fixed in master if it is... Cheers, Richard
From: Richard Purdie [richard.purdie@linuxfoundation.org] Sent: Friday, March 08, 2013 2:15 PM To: Khem Raj Cc: Dubielzig, Rich; Openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH] eglibc: Handle QA warnings in nativesdk (denzil) On Fri, 2013-03-08 at 14:11 -0800, Khem Raj wrote: > On Mar 8, 2013, at 2:07 PM, Rich Dubielzig <rich.dubielzig@windriver.com> wrote: > > > /var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not > > being properly handled by the do_package task in > > eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf > > is being included in the -utils subpackage. > > > > Signed-off-by: Rich Dubielzig <rich.dubielzig@windriver.com> > > --- > > meta/recipes-core/eglibc/eglibc-package.inc | 3 ++- > > meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- > > 2 files changed, 3 insertions(+), 2 deletions(-) > > Could you rebase it on master please ? > > > > > diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc > > index 3298dea..d51d943 100644 > > --- a/meta/recipes-core/eglibc/eglibc-package.inc > > +++ b/meta/recipes-core/eglibc/eglibc-package.inc > > @@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ > > 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}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" > > FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" > > FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" > > RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" > > @@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" > > eglibc_package_preprocess () { > > rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} > > rm -rf ${PKGD}/${libdir}/locale > > + rm -rf ${PKGD}/var Isn't this ${localstatesir} ? And as Khem said, fixes need to be considered for master first, or at least mention this is fixed in master if it is... Cheers, Richard
On Fri, 2013-03-08 at 14:07 -0800, Rich Dubielzig wrote: > -FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" > +FILES_${PN}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" Is that really correct? There seem to be several slightly dubious things about this patch: 1. In the version of oe-core I'm looking at, both ldconfig and ld.so.conf go into ${PN} if USE_LDCONFIG=1, which is the default. (Arguably this ought really to be a DISTRO_FEATURE nowadays.) So, adding them unconditionally to PN-utils seems like it is confusing at best. 2. ld.so.conf isn't a utility and it isn't entirely obvious that it belongs in PN-utils at all. 3. Your commit message didn't mention the change to ldconfig, and also didn't give any details of what exactly the QA warnings were that it was fixing. thanks p.
Patch
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 3298dea..d51d943 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -50,7 +50,7 @@ FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*_nonshared.a \ 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}-utils = "${bindir}/* ${sbindir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug" FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" @@ -121,5 +121,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess" eglibc_package_preprocess () { rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} rm -rf ${PKGD}/${libdir}/locale + rm -rf ${PKGD}/var } diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb index fe93b4b..b4bf692 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 = "r11" +PR = "r12" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_15"
/var/db/Makefile and /opt/(sdk path)/etc/ld.so.conf were not being properly handled by the do_package task in eglibc-nativesdk. /var/db is now deleted and /etc/ld.so.conf is being included in the -utils subpackage. Signed-off-by: Rich Dubielzig <rich.dubielzig@windriver.com> --- meta/recipes-core/eglibc/eglibc-package.inc | 3 ++- meta/recipes-core/eglibc/eglibc_2.15.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)