libc-package.bbclass: Add MLPREFIX while dynamically set RDEPENDS

We need to add MLPREFIX when set RDEPENDS by setVar() function.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 51edba2e3f16ed762d470d7e7ec7299daa10fb9e..57b6fd98f713ee950fc18b6118861d2ac738d6ed 100644 (file)
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -126,6 +126,8 @@ python package_do_split_gconvs () {
        if not d.getVar('PACKAGES', True):
                return
 
+       mlprefix = d.getVar("MLPREFIX", True) or ""
+
        bpn = d.getVar('BPN', True)
        libdir = d.getVar('libdir', True)
        if not libdir:
@@ -149,7 +151,7 @@ python package_do_split_gconvs () {
                for l in f.readlines():
                        m = c_re.match(l) or i_re.match(l)
                        if m:
-                               dp = legitimize_package_name('%s-gconv-%s' % (bpn, m.group(1)))
+                               dp = legitimize_package_name('%s%s-gconv-%s' % (mlprefix, bpn, m.group(1)))
                                if not dp in deps:
                                        deps.append(dp)
                f.close()
@@ -170,7 +172,7 @@ python package_do_split_gconvs () {
                for l in f.readlines():
                        m = c_re.match(l) or i_re.match(l)
                        if m:
-                               dp = legitimize_package_name('%s-charmap-%s' % (bpn, m.group(1)))
+                               dp = legitimize_package_name('%s%s-charmap-%s' % (mlprefix, bpn, m.group(1)))
                                if not dp in deps:
                                        deps.append(dp)
                f.close()
@@ -190,7 +192,7 @@ python package_do_split_gconvs () {
                for l in f.readlines():
                        m = c_re.match(l) or i_re.match(l)
                        if m:
-                               dp = legitimize_package_name(bpn+'-localedata-%s' % m.group(1))
+                               dp = legitimize_package_name(mlprefix+bpn+'-localedata-%s' % m.group(1))
                                if not dp in deps:
                                        deps.append(dp)
                f.close()
@@ -234,7 +236,7 @@ python package_do_split_gconvs () {
 
        def output_locale_source(name, pkgname, locale, encoding):
                d.setVar('RDEPENDS_%s' % pkgname, 'localedef %s-localedata-%s %s-charmap-%s' % \
-               (bpn, legitimize_package_name(locale), bpn, legitimize_package_name(encoding)))
+               (mlprefix+bpn, legitimize_package_name(locale), mlprefix+bpn, legitimize_package_name(encoding)))
                d.setVar('pkg_postinst_%s' % pkgname, d.getVar('locale_base_postinst', True) \
                % (locale, encoding, locale))
                d.setVar('pkg_postrm_%s' % pkgname, d.getVar('locale_base_postrm', True) % \
@@ -247,7 +249,7 @@ python package_do_split_gconvs () {
                else:
                        libc_name = name
                d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
-                       % (d.getVar('MLPREFIX') + bpn, libc_name)))
+                       % (mlprefix+bpn, libc_name)))
 
        commands = {}
 

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 9d5434f6538513f6697747b4431824c55b947b6b..70c5cd1794779c57d14f33714a0cdb1e77685bdf 100644 (file)
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
 # set "0" for qemu emulation of native localedef for locale generation
 LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
 
-PR = "r20"
+PR = "r21"
 
 PKGSUFFIX = ""
 PKGSUFFIX_virtclass-nativesdk = "-nativesdk"