(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>

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 () {
                 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 99836e92f3..6fba5b6907 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: