summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-05-18 17:18:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-18 15:25:10 +0100
commit8de572f95ad2723a7e1e87690753d1053786cd9f (patch)
treeea74d3df18e08f1a02187d5b221e6f2aa64781c3
parentb7c1ac86909b1479434048c3e1d013d6efd9eac8 (diff)
downloadpoky-8de572f95ad2723a7e1e87690753d1053786cd9f.tar.gz
(libc-)package.bbclass: Added MLPREFIX to locale packages.
Added multilib prefix to the locale related package names/dependencies. (From OE-Core rev: a52f7cf2cc90d918e3250c410995dcc1f3bfd5ee) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-package.bbclass4
-rw-r--r--meta/classes/package.bbclass5
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 57b6fd98f7..10f5f87487 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -308,10 +308,10 @@ python package_do_split_gconvs () {
308 pkgname = d.getVar('MLPREFIX') + 'locale-base-' + legitimize_package_name(name) 308 pkgname = d.getVar('MLPREFIX') + 'locale-base-' + legitimize_package_name(name)
309 d.setVar('ALLOW_EMPTY_%s' % pkgname, '1') 309 d.setVar('ALLOW_EMPTY_%s' % pkgname, '1')
310 d.setVar('PACKAGES', '%s %s' % (pkgname, d.getVar('PACKAGES', True))) 310 d.setVar('PACKAGES', '%s %s' % (pkgname, d.getVar('PACKAGES', True)))
311 rprovides = ' virtual-locale-%s' % legitimize_package_name(name) 311 rprovides = ' %svirtual-locale-%s' % (mlprefix, legitimize_package_name(name))
312 m = re.match("(.*)_(.*)", name) 312 m = re.match("(.*)_(.*)", name)
313 if m: 313 if m:
314 rprovides += ' virtual-locale-%s' % m.group(1) 314 rprovides += ' %svirtual-locale-%s' % (mlprefix, m.group(1))
315 d.setVar('RPROVIDES_%s' % pkgname, rprovides) 315 d.setVar('RPROVIDES_%s' % pkgname, rprovides)
316 316
317 if use_bin == "compile": 317 if use_bin == "compile":
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 99836e92f3..6fba5b6907 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -400,13 +400,14 @@ python package_do_split_locales() {
400 summary = d.getVar('SUMMARY', True) or pn 400 summary = d.getVar('SUMMARY', True) or pn
401 description = d.getVar('DESCRIPTION', True) or "" 401 description = d.getVar('DESCRIPTION', True) or ""
402 locale_section = d.getVar('LOCALE_SECTION', True) 402 locale_section = d.getVar('LOCALE_SECTION', True)
403 mlprefix = d.getVar('MLPREFIX', True) or ""
403 for l in sorted(locales): 404 for l in sorted(locales):
404 ln = legitimize_package_name(l) 405 ln = legitimize_package_name(l)
405 pkg = pn + '-locale-' + ln 406 pkg = pn + '-locale-' + ln
406 packages.append(pkg) 407 packages.append(pkg)
407 d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l)) 408 d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l))
408 d.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (pn, ln)) 409 d.setVar('RDEPENDS_' + pkg, '%s %svirtual-locale-%s' % (pn, mlprefix, ln))
409 d.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln)) 410 d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
410 d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) 411 d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
411 d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) 412 d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))
412 if locale_section: 413 if locale_section: