summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-08 15:38:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-17 17:32:20 +0100
commit17e1bfe2b1260add9749b5ff73c72d57c0215fdc (patch)
treef4d425ba207221a82420bc7ea59fddad70714b22
parent40cf43c1c2fa15d0ee4bcc1226d9184747695b88 (diff)
downloadopenembedded-core-17e1bfe2b1260add9749b5ff73c72d57c0215fdc.tar.gz
openembedded-core-17e1bfe2b1260add9749b5ff73c72d57c0215fdc.tar.bz2
openembedded-core-17e1bfe2b1260add9749b5ff73c72d57c0215fdc.zip
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@linuxfoundation.org>
-rw-r--r--meta/classes/libc-package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 80d7124002..3a131540f3 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' \