[oe-commits] Richard Purdie : libc-package: Drop bogus replacement operation

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 251958617d1e149575316b478389901417892c26
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=251958617d1e149575316b478389901417892c26

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Oct  8 15:38:52 2012 +0000

libc-package: Drop bogus replacement operation

The names used to generate the binary-localdata packages need to match the location
the dependencies are added. In one case the dash replacement is made, in the other it
is not leading to packages which cannot be installed:

	eglibc-binary-localedata-af-za.iso88591 is needed by locale-base-af-za.iso-8859-1-2.16-r22.i586
	eglibc-binary-localedata-cs-cz.iso88592 is needed by locale-base-cs-cz.iso-8859-2-2.16-r22.i586
	eglibc-binary-localedata-ru-ru.koi8r is needed by locale-base-ru-ru.koi8-r-2.16-r22.i586
	eglibc-binary-localedata-pl-pl.iso88592 is needed by locale-base-pl-pl.iso-8859-2-2.16-r22.i586
	eglibc-binary-localedata-hu-hu.iso88592 is needed by locale-base-hu-hu.iso-8859-2-2.16-r22.i586
	eglibc-binary-localedata-de-at+euro.iso885915 is needed by locale-base-de-at+euro.iso-8859-15-2.16-r22.i586
	eglibc-binary-localedata-sv-fi.iso88591 is needed by locale-base-sv-fi.iso-8859-1-2.16-r22.i586

This fixes things so the names are consistent.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/libc-package.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 80d7124..3a13154 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -246,7 +246,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())
         else:
             libc_name = name
         d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \