Patchwork eglibc: ensure that NSS libs go into the right package when ${base_libdir} and ${libdir} are the same

login
register
mail settings
Submitter Phil Blundell
Date July 13, 2011, 9:03 a.m.
Message ID <1310547824.6337.212.camel@phil-desktop>
Download mbox | patch
Permalink /patch/7527/
State New, archived
Headers show

Comments

Phil Blundell - July 13, 2011, 9:03 a.m.
Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
that the devel symlinks don't get caught.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
 meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Richard Purdie - July 13, 2011, 11:08 a.m.
On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
> that the devel symlinks don't get caught.
> 
> Signed-off-by: Phil Blundell <philb@gnu.org>
> ---
>  meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
>  meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard
Koen Kooi - July 13, 2011, 11:13 a.m.
Op 13 jul 2011, om 13:08 heeft Richard Purdie het volgende geschreven:

> On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
>> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
>> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
>> that the devel symlinks don't get caught.
>> 
>> Signed-off-by: Phil Blundell <philb@gnu.org>
>> ---
>> meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
>> meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
>> 2 files changed, 3 insertions(+), 3 deletions(-)
> 
> Merged to master, thanks.

That is missing a PR bump for eglibc 2.12
Phil Blundell - July 13, 2011, 11:26 a.m.
On Wed, 2011-07-13 at 13:13 +0200, Koen Kooi wrote:
> Op 13 jul 2011, om 13:08 heeft Richard Purdie het volgende geschreven:
> 
> > On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
> >> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
> >> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
> >> that the devel symlinks don't get caught.
> >> 
> >> Signed-off-by: Phil Blundell <philb@gnu.org>
> >> ---
> >> meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
> >> meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
> >> 2 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > Merged to master, thanks.
> 
> That is missing a PR bump for eglibc 2.12

Oh yeah.  Do we really need to keep 2.12 around still?

I also wonder if glibc 2.10 could/should be deleted now.  That recipe
probably has a lot of the same issues that we've been fixing in eglibc
recently and it seems a bit of a waste of time to keep beating away at a
package that's four major versions out of date.

p.
Koen Kooi - July 13, 2011, 1:14 p.m.
Op 13 jul 2011, om 13:26 heeft Phil Blundell het volgende geschreven:

> On Wed, 2011-07-13 at 13:13 +0200, Koen Kooi wrote:
>> Op 13 jul 2011, om 13:08 heeft Richard Purdie het volgende geschreven:
>> 
>>> On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
>>>> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
>>>> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
>>>> that the devel symlinks don't get caught.
>>>> 
>>>> Signed-off-by: Phil Blundell <philb@gnu.org>
>>>> ---
>>>> meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
>>>> meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
>>>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>> 
>>> Merged to master, thanks.
>> 
>> That is missing a PR bump for eglibc 2.12
> 
> Oh yeah.  Do we really need to keep 2.12 around still?

It's the default for angstrom, dunno if that's a good enough reason :)
Richard Purdie - July 14, 2011, 2:16 p.m.
On Wed, 2011-07-13 at 15:14 +0200, Koen Kooi wrote:
> Op 13 jul 2011, om 13:26 heeft Phil Blundell het volgende geschreven:
> 
> > On Wed, 2011-07-13 at 13:13 +0200, Koen Kooi wrote:
> >> Op 13 jul 2011, om 13:08 heeft Richard Purdie het volgende geschreven:
> >> 
> >>> On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
> >>>> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
> >>>> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
> >>>> that the devel symlinks don't get caught.
> >>>> 
> >>>> Signed-off-by: Phil Blundell <philb@gnu.org>
> >>>> ---
> >>>> meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
> >>>> meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
> >>>> 2 files changed, 3 insertions(+), 3 deletions(-)
> >>> 
> >>> Merged to master, thanks.
> >> 
> >> That is missing a PR bump for eglibc 2.12
> > 
> > Oh yeah.  Do we really need to keep 2.12 around still?
> 
> It's the default for angstrom, dunno if that's a good enough reason :)

Does Angstrom have any plans to switch to 2.13?

Certainly we're not aware of issues with 2.13 and as such we should
really consider phasing out 2.12 from OE-Core at least...

Cheers,

Richard
Phil Blundell - July 14, 2011, 2:25 p.m.
On Thu, 2011-07-14 at 15:16 +0100, Richard Purdie wrote:
> On Wed, 2011-07-13 at 15:14 +0200, Koen Kooi wrote:
> > Op 13 jul 2011, om 13:26 heeft Phil Blundell het volgende geschreven:
> > 
> > > On Wed, 2011-07-13 at 13:13 +0200, Koen Kooi wrote:
> > >> Op 13 jul 2011, om 13:08 heeft Richard Purdie het volgende geschreven:
> > >> 
> > >>> On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
> > >>>> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
> > >>>> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
> > >>>> that the devel symlinks don't get caught.
> > >>>> 
> > >>>> Signed-off-by: Phil Blundell <philb@gnu.org>
> > >>>> ---
> > >>>> meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
> > >>>> meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
> > >>>> 2 files changed, 3 insertions(+), 3 deletions(-)
> > >>> 
> > >>> Merged to master, thanks.
> > >> 
> > >> That is missing a PR bump for eglibc 2.12
> > > 
> > > Oh yeah.  Do we really need to keep 2.12 around still?
> > 
> > It's the default for angstrom, dunno if that's a good enough reason :)
> 
> Does Angstrom have any plans to switch to 2.13?
> 
> Certainly we're not aware of issues with 2.13 and as such we should
> really consider phasing out 2.12 from OE-Core at least...

How about glibc 2.10; is anybody still using that at all?

p.
Koen Kooi - July 14, 2011, 3:32 p.m.
Op 14 jul 2011, om 16:16 heeft Richard Purdie het volgende geschreven:

> On Wed, 2011-07-13 at 15:14 +0200, Koen Kooi wrote:
>> Op 13 jul 2011, om 13:26 heeft Phil Blundell het volgende geschreven:
>> 
>>> On Wed, 2011-07-13 at 13:13 +0200, Koen Kooi wrote:
>>>> Op 13 jul 2011, om 13:08 heeft Richard Purdie het volgende geschreven:
>>>> 
>>>>> On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
>>>>>> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
>>>>>> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
>>>>>> that the devel symlinks don't get caught.
>>>>>> 
>>>>>> Signed-off-by: Phil Blundell <philb@gnu.org>
>>>>>> ---
>>>>>> meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
>>>>>> meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
>>>>>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>>>> 
>>>>> Merged to master, thanks.
>>>> 
>>>> That is missing a PR bump for eglibc 2.12
>>> 
>>> Oh yeah.  Do we really need to keep 2.12 around still?
>> 
>> It's the default for angstrom, dunno if that's a good enough reason :)
> 
> Does Angstrom have any plans to switch to 2.13?

angstrom-bleeding is on 2.13, but as the name implies, it's on the bleeding edge
Khem Raj - July 14, 2011, 7:47 p.m.
On Thu, Jul 14, 2011 at 7:25 AM, Phil Blundell <philb@gnu.org> wrote:
> On Thu, 2011-07-14 at 15:16 +0100, Richard Purdie wrote:
>> On Wed, 2011-07-13 at 15:14 +0200, Koen Kooi wrote:
>> > Op 13 jul 2011, om 13:26 heeft Phil Blundell het volgende geschreven:
>> >
>> > > On Wed, 2011-07-13 at 13:13 +0200, Koen Kooi wrote:
>> > >> Op 13 jul 2011, om 13:08 heeft Richard Purdie het volgende geschreven:
>> > >>
>> > >>> On Wed, 2011-07-13 at 10:03 +0100, Phil Blundell wrote:
>> > >>>> Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
>> > >>>> Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
>> > >>>> that the devel symlinks don't get caught.
>> > >>>>
>> > >>>> Signed-off-by: Phil Blundell <philb@gnu.org>
>> > >>>> ---
>> > >>>> meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
>> > >>>> meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
>> > >>>> 2 files changed, 3 insertions(+), 3 deletions(-)
>> > >>>
>> > >>> Merged to master, thanks.
>> > >>
>> > >> That is missing a PR bump for eglibc 2.12
>> > >
>> > > Oh yeah.  Do we really need to keep 2.12 around still?
>> >
>> > It's the default for angstrom, dunno if that's a good enough reason :)
>>
>> Does Angstrom have any plans to switch to 2.13?
>>
>> Certainly we're not aware of issues with 2.13 and as such we should
>> really consider phasing out 2.12 from OE-Core at least...
>
> How about glibc 2.10; is anybody still using that at all?

I think all glibc recipes should go away.

>
> p.
>
>
>
> _______________________________________________
> 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 dd40af1..1a9953d 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -20,7 +20,7 @@  USE_LDCONFIG ?= "1"
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
-PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}"
+PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}"
 
 # Create a eglibc-binaries
 ALLOW_EMPTY_${PN}-binaries = "1"
@@ -58,7 +58,7 @@  FILES_ldd${PKGSUFFIX} = "${bindir}/ldd"
 FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*"
 FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
 FILES_libmemusage = "${base_libdir}/libmemusage.so"
-FILES_eglibc-extra-nss = "${base_libdir}/libnss*"
+FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
 FILES_sln = "/sbin/sln"
 FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
 FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index be65787..ec88d9d 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 = "r6"
+PR = "r7"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"