libc-package: Drop bogus replacement operation
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 8 Oct 2012 15:38:52 +0000 (15:38 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 18 Oct 2012 11:13:12 +0000 (12:13 +0100)
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.

(From OE-Core rev: 17e1bfe2b1260add9749b5ff73c72d57c0215fdc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/libc-package.bbclass

index 80d7124..3a13154 100644 (file)
@@ -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' \