summaryrefslogtreecommitdiffstats
path: root/meta
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:06:57 +0100
commit9df33286b057f9257aae64d8724e6d1f39f722f2 (patch)
tree2f78e99b709472d446b6e5be8c94af14b426ee7b /meta
parentac47c1b30d055e8f10c4d895210f7c92ebb5c42c (diff)
downloadpoky-9df33286b057f9257aae64d8724e6d1f39f722f2.tar.gz
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. (From OE-Core rev: e5810439cc394d8ebfc264b05e1fbfad19e8fcd3) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
241 (locale, encoding, locale), d) 241 (locale, encoding, locale), d)
242 242
243 def output_locale_binary_rdepends(name, pkgname, locale, encoding): 243 def output_locale_binary_rdepends(name, pkgname, locale, encoding):
244 m = re.match("(.*)_(.*)", name) 244 m = re.match("(.*)\.(.*)", name)
245 if m: 245 if m:
246 libc_name = "%s-%s" % (m.group(1), m.group(2).lower().replace("-","")) 246 libc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
247 else: 247 else:
248 libc_name = name 248 libc_name = name
249 bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ 249 bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \