From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.pbcl.net ([88.198.119.4] helo=hetzner.pbcl.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QwxDV-0007Uw-CM for openembedded-core@lists.openembedded.org; Fri, 26 Aug 2011 16:17:05 +0200 Received: from elite.brightsigndigital.co.uk ([81.142.160.137] helo=[172.30.1.145]) by hetzner.pbcl.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Qwx8s-0007gM-RU for openembedded-core@lists.openembedded.org; Fri, 26 Aug 2011 16:12:19 +0200 From: Phil Blundell To: Patches and discussions about the oe-core layer Date: Fri, 26 Aug 2011 15:12:17 +0100 In-Reply-To: <1314284316.5939.196.camel@rex> References: <1314210721-29941-1-git-send-email-koen@dominion.thruhere.net> <1314264296.19905.29.camel@phil-desktop> <1314284316.5939.196.camel@rex> X-Mailer: Evolution 3.0.2- Message-ID: <1314367938.19905.90.camel@phil-desktop> Mime-Version: 1.0 Subject: Re: [PATCH 1/2] libc-package bbclass: fix binary localedata dependency code X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Aug 2011 14:17:05 -0000 X-Groupsio-MsgNum: 8833 Content-Type: multipart/mixed; boundary="=-U6fGnocemuUSHyq1IQhL" --=-U6fGnocemuUSHyq1IQhL Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Thu, 2011-08-25 at 07:58 -0700, Richard Purdie wrote: > On Thu, 2011-08-25 at 10:24 +0100, Phil Blundell wrote: > > On Wed, 2011-08-24 at 20:32 +0200, Koen Kooi wrote: > > > diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass > > > index 0d5ce20..d3b33d6 100644 > > > --- a/meta/classes/libc-package.bbclass > > > +++ b/meta/classes/libc-package.bbclass > > > @@ -243,7 +243,7 @@ python package_do_split_gconvs () { > > > def output_locale_binary_rdepends(name, pkgname, locale, encoding): > > > 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' \ > > > > For what it's worth (probably not much), this is not quite the right > > fix. Joining with "." was correct; it was the splitting on "_" that was > > wrong. The right thing would be to put it back how it was before the > > glibc/eglibc merge commit, i.e. change the re to "(*.)\.(*.)" and leave > > the output pattern alone. That ought to fix your problem and also allow > > the encoding to be correctly canonicalised. > > Can someone please send me the correct patch against master? :) I think the attached is what you need. Koen, maybe you could confirm whether this does indeed fix your original problem. p. --=-U6fGnocemuUSHyq1IQhL Content-Disposition: attachment; filename*0=0001-libc-package-restore-correct-mangling-behavior-for-l.pat; filename*1=ch Content-Type: text/x-patch; name="0001-libc-package-restore-correct-mangling-behavior-for-l.patch"; charset="UTF-8" Content-Transfer-Encoding: 7bit >From 1cd91a91802776ddede041cfa222b603da6c8453 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 26 Aug 2011 15:05:11 +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 --- 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,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 --=-U6fGnocemuUSHyq1IQhL--