summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-08-26 17:51:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-31 18:05:13 +0100
commite5810439cc394d8ebfc264b05e1fbfad19e8fcd3 (patch)
tree2e57661078840c1fde47347f934f9c53eda547bf
parent3f4017e36410a6435f50183e76b9adb1db1f4126 (diff)
downloadopenembedded-core-e5810439cc394d8ebfc264b05e1fbfad19e8fcd3.tar.gz
openembedded-core-e5810439cc394d8ebfc264b05e1fbfad19e8fcd3.tar.bz2
openembedded-core-e5810439cc394d8ebfc264b05e1fbfad19e8fcd3.zip
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-package.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index d3b33d6c5c..9d328441cc 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' \