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>

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index d3b33d6c5c4d035201bc25541d0cf17dc7e908bc..9d328441cc81e3ac5a6fe7b4739305851585b654 100644 (file)
--- 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' \