Patchwork [5/7] eglibc: fix installed but not packaged files

login
register
mail settings
Submitter Nitin A Kamble
Date July 7, 2011, 8:25 p.m.
Message ID <24e836176430410a91d0c18fcef0854536798766.1310070283.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/7177/
State New, archived
Headers show

Comments

Nitin A Kamble - July 7, 2011, 8:25 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

Fixes these package QA warnings:

WARNING: For recipe eglibc, the following files were installed but not shipped in any package:
WARNING:   /etc/rpc
WARNING:   /etc/localtime

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    6 +++++-
 meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
Phil Blundell - July 7, 2011, 8:42 p.m.
On Thu, 2011-07-07 at 13:25 -0700, nitin.a.kamble@intel.com wrote:
> -FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
> +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/rpc ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"

I don't think we want /etc/rpc in libc6, it's just a waste of space if
you aren't using sunrpc.  Nobody has missed it thus far so I would be
inclined to delete it, but it could go in a package of its own if there
is a feeling that it's valuable.

p.
Khem Raj - July 7, 2011, 9:41 p.m.
On Thu, Jul 7, 2011 at 1:42 PM, Phil Blundell <pb@pbcl.net> wrote:
> On Thu, 2011-07-07 at 13:25 -0700, nitin.a.kamble@intel.com wrote:
>> -FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
>> +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/rpc ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
>
> I don't think we want /etc/rpc in libc6, it's just a waste of space if
> you aren't using sunrpc.  Nobody has missed it thus far so I would be
> inclined to delete it, but it could go in a package of its own if there
> is a feeling that it's valuable.

Moreover sun rpc is now obsolete in glibc 2.14 onwards so probably
removing it from package is right thing to do.
>
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Richard Purdie - July 7, 2011, 11:11 p.m.
On Thu, 2011-07-07 at 14:41 -0700, Khem Raj wrote:
> On Thu, Jul 7, 2011 at 1:42 PM, Phil Blundell <pb@pbcl.net> wrote:
> > On Thu, 2011-07-07 at 13:25 -0700, nitin.a.kamble@intel.com wrote:
> >> -FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
> >> +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/rpc ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
> >
> > I don't think we want /etc/rpc in libc6, it's just a waste of space if
> > you aren't using sunrpc.  Nobody has missed it thus far so I would be
> > inclined to delete it, but it could go in a package of its own if there
> > is a feeling that it's valuable.
> 
> Moreover sun rpc is now obsolete in glibc 2.14 onwards so probably
> removing it from package is right thing to do.

We have a line deleting this but the libc-locale split seems to have
wiped out a few packaging fixes including the one that unbreaks it. I
have a local patch pending to fix the deletion of this...

Cheers,

Richard
Nitin A Kamble - July 8, 2011, 5:04 p.m.
Thanks for clarifications. I will rework the patch to take out the rpc.
Nitin


> -----Original Message-----

> From: openembedded-core-bounces@lists.openembedded.org

> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of

> Khem Raj

> Sent: Thursday, July 07, 2011 2:41 PM

> To: Patches and discussions about the oe-core layer

> Subject: Re: [OE-core] [PATCH 5/7] eglibc: fix installed but not

> packaged files

> 

> On Thu, Jul 7, 2011 at 1:42 PM, Phil Blundell <pb@pbcl.net> wrote:

> > On Thu, 2011-07-07 at 13:25 -0700, nitin.a.kamble@intel.com wrote:

> >> -FILES_${PN} = "${libc_baselibs} ${libexecdir}/*

> ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig

> ${sysconfdir}/ld.so.conf', '', d)}"

> >> +FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/rpc

> ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig

> ${sysconfdir}/ld.so.conf', '', d)}"

> >

> > I don't think we want /etc/rpc in libc6, it's just a waste of space

> if

> > you aren't using sunrpc.  Nobody has missed it thus far so I would be

> > inclined to delete it, but it could go in a package of its own if

> there

> > is a feeling that it's valuable.

> 

> Moreover sun rpc is now obsolete in glibc 2.14 onwards so probably

> removing it from package is right thing to do.

> >

> > p.

> >

> >

> >

> > _______________________________________________

> > 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

Patch

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 1c6626c..feb3a98 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -53,7 +53,7 @@  RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
 RPROVIDES_eglibc-dbg = "glibc-dbg"
 libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
 
-FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/rpc ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
 FILES_ldd${PKGSUFFIX} = "${bindir}/ldd"
 FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*"
 FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
@@ -88,6 +88,10 @@  DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through
 
 inherit libc-common
 
+do_install_append () {
+	rm -f ${D}${sysconfdir}/localtime
+}
+
 do_install_locale () {
 	dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
 	install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
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"