[oe-commits] Zhai Edwin : Multilib: Fix RDEPENDS in libc-package.bbclass, useradd. bbclass...

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 380efadd5640e5b57e710549b1ae761d0d3b3792
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=380efadd5640e5b57e710549b1ae761d0d3b3792

Author: Zhai Edwin <edwin.zhai at intel.com>
Date:   Mon Apr 16 14:50:00 2012 +0800

Multilib: Fix RDEPENDS in libc-package.bbclass, useradd.bbclass...

MLPREFIX is needed in RDEPENDS for multilib build

Signed-off-by: Zhai Edwin <edwin.zhai at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/gconf.bbclass        |    2 +-
 meta/classes/libc-package.bbclass |    2 +-
 meta/classes/useradd.bbclass      |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index 095d04b..a966c26 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -57,7 +57,7 @@ python populate_packages_append () {
 			prerm += d.getVar('gconf_prerm', True)
 			d.setVar('pkg_prerm_%s' % pkg, prerm)
 			rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
-			rdepends += " gconf"
+			rdepends += ' ' + d.getVar('MLPREFIX') + 'gconf'
 			d.setVar("RDEPENDS_%s" % pkg, rdepends)
 
 }
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 7cde770..bb4ba68 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -257,7 +257,7 @@ python package_do_split_gconvs () {
 		else:
 			libc_name = name
 		d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
-			% (bpn, libc_name)))
+			% (d.getVar('MLPREFIX') + bpn, libc_name)))
 
 	commands = {}
 
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 0bbb371..0ed91ad 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -201,7 +201,8 @@ fakeroot python populate_packages_prepend () {
 
 		# RDEPENDS setup
 		rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
-		rdepends += " base-passwd shadow"
+		rdepends += ' ' + d.getVar('MLPREFIX') + 'base-passwd'
+		rdepends += ' ' + d.getVar('MLPREFIX') + 'shadow'
 		d.setVar("RDEPENDS_%s" % pkg, rdepends)
 
 	# Add the user/group preinstall scripts and RDEPENDS requirements