summaryrefslogtreecommitdiff
path: root/meta
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:22:22 +0100
commita52f7cf2cc90d918e3250c410995dcc1f3bfd5ee (patch)
tree42991412630c733cecaff38d803d0fbf89425544 /meta
parent7163ebd92a799b8f000b2b6f303b20de468b5f90 (diff)
downloadopenembedded-core-a52f7cf2cc90d918e3250c410995dcc1f3bfd5ee.tar.gz
openembedded-core-a52f7cf2cc90d918e3250c410995dcc1f3bfd5ee.tar.bz2
openembedded-core-a52f7cf2cc90d918e3250c410995dcc1f3bfd5ee.tar.xz
openembedded-core-a52f7cf2cc90d918e3250c410995dcc1f3bfd5ee.zip
(libc-)package.bbclass: Added MLPREFIX to locale packages.
Added multilib prefix to the locale related package names/dependencies. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 57b6fd98f..10f5f8748 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -308,10 +308,10 @@ python package_do_split_gconvs () {
pkgname = d.getVar('MLPREFIX') + 'locale-base-' + legitimize_package_name(name)
d.setVar('ALLOW_EMPTY_%s' % pkgname, '1')
d.setVar('PACKAGES', '%s %s' % (pkgname, d.getVar('PACKAGES', True)))
- rprovides = ' virtual-locale-%s' % legitimize_package_name(name)
+ rprovides = ' %svirtual-locale-%s' % (mlprefix, legitimize_package_name(name))
m = re.match("(.*)_(.*)", name)
if m:
- rprovides += ' virtual-locale-%s' % m.group(1)
+ rprovides += ' %svirtual-locale-%s' % (mlprefix, m.group(1))
d.setVar('RPROVIDES_%s' % pkgname, rprovides)
if use_bin == "compile":
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 99836e92f..6fba5b690 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -400,13 +400,14 @@ python package_do_split_locales() {
summary = d.getVar('SUMMARY', True) or pn
description = d.getVar('DESCRIPTION', True) or ""
locale_section = d.getVar('LOCALE_SECTION', True)
+ mlprefix = d.getVar('MLPREFIX', True) or ""
for l in sorted(locales):
ln = legitimize_package_name(l)
pkg = pn + '-locale-' + ln
packages.append(pkg)
d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l))
- d.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (pn, ln))
- d.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln))
+ d.setVar('RDEPENDS_' + pkg, '%s %svirtual-locale-%s' % (pn, mlprefix, ln))
+ d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))
if locale_section: