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

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

Comments

Phil Blundell - Aug. 26, 2011, 3:30 p.m.
On Fri, 2011-08-26 at 17:26 +0200, Koen Kooi wrote:
> And that gives me http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd
> 
> -locale_base_en_us -> eglibc_binary_localedata_en_us;
> +locale_base_en_us -> eglibc_binary_localedata_en_u_;
> 
> So something regexp is being a bit too greedy by the looks of it.

Ah whoops, the old missing backslash.  Could you try this one instead?

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

> On Fri, 2011-08-26 at 17:26 +0200, Koen Kooi wrote:
>> And that gives me http://git.angstrom-distribution.org/cgi-bin/cgit.cgi/testlab/commit/?h=yocto&id=9b2e08e0c4da4881ba8c83be39697a40a63b75fd
>> 
>> -locale_base_en_us -> eglibc_binary_localedata_en_us;
>> +locale_base_en_us -> eglibc_binary_localedata_en_u_;
>> 
>> So something regexp is being a bit too greedy by the looks of it.
> 
> Ah whoops, the old missing backslash.  Could you try this one instead?

That one doesn't seem to apply:

koen@dominion:/OE/tentacle/sources/openembedded-core$ git am -s /tmp/0001-libc-package-restore-correct-mangling-behavior-for-l-1.patch 
Applying: libc-package: restore correct mangling behavior for locale names
error: patch failed: meta/classes/libc-package.bbclass:241
error: meta/classes/libc-package.bbclass: patch does not apply
Patch failed at 0001 libc-package: restore correct mangling behavior for locale names
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

Patch

From 1cd91a91802776ddede041cfa222b603da6c8453 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Fri, 26 Aug 2011 15:05:11 +0100
Subject: [PATCH v2] 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..f8df6a4 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -241,10 +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