summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2012-04-16 14:50:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 12:51:19 +0100
commit380efadd5640e5b57e710549b1ae761d0d3b3792 (patch)
tree15755febbabdfeb268c7f99c99baeeeb7e2acf6c /meta/classes
parentbc85abc5013d0c831cc3c3823df45536c293aaba (diff)
downloadopenembedded-core-380efadd5640e5b57e710549b1ae761d0d3b3792.tar.gz
openembedded-core-380efadd5640e5b57e710549b1ae761d0d3b3792.tar.bz2
openembedded-core-380efadd5640e5b57e710549b1ae761d0d3b3792.tar.xz
openembedded-core-380efadd5640e5b57e710549b1ae761d0d3b3792.zip
Multilib: Fix RDEPENDS in libc-package.bbclass, useradd.bbclass...
MLPREFIX is needed in RDEPENDS for multilib build Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/gconf.bbclass2
-rw-r--r--meta/classes/libc-package.bbclass2
-rw-r--r--meta/classes/useradd.bbclass3
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index 095d04b1b..a966c268b 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 7cde7701a..bb4ba682d 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 0bbb371b2..0ed91ad2c 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