Patchwork eglibc-locale: fix localedef packaging

login
register
mail settings
Submitter Koen Kooi
Date June 28, 2011, 3:30 p.m.
Message ID <1309275023-2626-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/6617/
State New, archived
Headers show

Comments

Koen Kooi - June 28, 2011, 3:30 p.m.
the ${PN} still needs some checking, since it will now inheriting the default FILES_${PN}

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/eglibc/eglibc-locale.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - June 28, 2011, 4:11 p.m.
On Tue, 2011-06-28 at 17:30 +0200, Koen Kooi wrote:
> the ${PN} still needs some checking, since it will now inheriting the default FILES_${PN}
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

I merged a different version of this which drops PN-locale and fixes
glibc too.

Cheers,

Richard
Koen Kooi - June 28, 2011, 8:32 p.m.
Op 28 jun 2011, om 18:11 heeft Richard Purdie het volgende geschreven:

> On Tue, 2011-06-28 at 17:30 +0200, Koen Kooi wrote:
>> the ${PN} still needs some checking, since it will now inheriting the default FILES_${PN}
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> 
> I merged a different version of this which drops PN-locale and fixes
> glibc too.

From http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=0d0e14cda2ddd881d09798b0e6edd8086aa9b6d9

+libc6 -> libc6_dev;

So libc6 now depends on libc6-dev :(
Phil Blundell - June 29, 2011, 1:36 p.m.
On Tue, 2011-06-28 at 22:32 +0200, Koen Kooi wrote:
> From http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=0d0e14cda2ddd881d09798b0e6edd8086aa9b6d9
> 
> +libc6 -> libc6_dev;
> 
> So libc6 now depends on libc6-dev :(

I guess it would be straightforward to patch insane.bbclass to detect
that particular failure (which does indeed seem to happen to libc
distressingly often).  It already diagnoses the case where a package
erroneously depends on a -dbg package, and I can't think of any reason
why the same logic couldn't be applied to -dev.

p.
Richard Purdie - June 29, 2011, 1:49 p.m.
On Wed, 2011-06-29 at 14:36 +0100, Phil Blundell wrote:
> On Tue, 2011-06-28 at 22:32 +0200, Koen Kooi wrote:
> > From http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=0d0e14cda2ddd881d09798b0e6edd8086aa9b6d9
> > 
> > +libc6 -> libc6_dev;
> > 
> > So libc6 now depends on libc6-dev :(
> 
> I guess it would be straightforward to patch insane.bbclass to detect
> that particular failure (which does indeed seem to happen to libc
> distressingly often).  It already diagnoses the case where a package
> erroneously depends on a -dbg package, and I can't think of any reason
> why the same logic couldn't be applied to -dev.

I'd love to see a patch for this! :)

Cheers,

Richard
Koen Kooi - June 29, 2011, 10:31 p.m.
Op 28 jun 2011, om 18:11 heeft Richard Purdie het volgende geschreven:

> On Tue, 2011-06-28 at 17:30 +0200, Koen Kooi wrote:
>> the ${PN} still needs some checking, since it will now inheriting the default FILES_${PN}
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> 
> I merged a different version of this which drops PN-locale and fixes
> glibc too.

It's getting late here, so I haven't double checked the bug, but:

 * check_data_file_clashes: Package eglibc-utils wants to install file /usr/bin/localedef
        But that file is already provided by package  * localedef

This seems fixable by a strategically placed 'rm' in eglibc-package.inc

Patch

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index ed6c099..fdc4fb4 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,12 +26,12 @@  BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r0"
+PR = "r1"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
 
-PACKAGES = "eglibc-locale localedef${PKGSUFFIX}"
+PACKAGES = "localedef${PKGSUFFIX} glibc-locale"
 
 PACKAGES_DYNAMIC = "locale-base-* \
                     eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* \