Patchwork [1/2] libc-package bbclass: fix binary localedata dependency code

login
register
mail settings
Submitter Phil Blundell
Date Aug. 30, 2011, 9:26 a.m.
Message ID <1314696364.19905.107.camel@phil-desktop>
Download mbox | patch
Permalink /patch/10751/
State New, archived
Headers show

Comments

Phil Blundell - Aug. 30, 2011, 9:26 a.m.
On Fri, 2011-08-26 at 18:31 +0200, Koen Kooi wrote:
> That one doesn't seem to apply:

Hm, yes, it seems I somehow damaged the patch in my last mail.  Third
time lucky then.

p.
Koen Kooi - Aug. 31, 2011, 1:47 p.m.
Op 30 aug. 2011, om 11:26 heeft Phil Blundell het volgende geschreven:

> On Fri, 2011-08-26 at 18:31 +0200, Koen Kooi wrote:
>> That one doesn't seem to apply:
> 
> Hm, yes, it seems I somehow damaged the patch in my last mail.  Third
> time lucky then.

That seems to fix it, thanks
Richard Purdie - Aug. 31, 2011, 5:05 p.m.
On Tue, 2011-08-30 at 10:26 +0100, Phil Blundell wrote:
> On Fri, 2011-08-26 at 18:31 +0200, Koen Kooi wrote:
> > That one doesn't seem to apply:
> 
> Hm, yes, it seems I somehow damaged the patch in my last mail.  Third
> time lucky then.

Merged to master, thanks.

Richard

Patch

From c3a2a50b6693e54aeb8c2fa635360aea53df2957 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Fri, 26 Aug 2011 17:51:47 +0100
Subject: [PATCH] libc-package: restore correct mangling behavior for locale names

This reverts 19fb07bf337e1d724798e2eb4479c35fc45b1941 and restores
the behaviour of the code to the way it was prior to 561d875404ef1783f94f37314b6e756766db8411.

See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/007407.html and subsequent messages.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/classes/libc-package.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index d3b33d6..9d32844 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -241,9 +241,9 @@  python package_do_split_gconvs () {
 		(locale, encoding, locale), d)
 
 	def output_locale_binary_rdepends(name, pkgname, locale, encoding):
-		m = re.match("(.*)_(.*)", name)
+		m = re.match("(.*)\.(.*)", name)
 		if m:
-			libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-",""))
+			libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
 		else:
 			libc_name = name
 		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
-- 
1.7.4.1