summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2012-04-16 06:50:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-16 11:52:10 (GMT)
commitd1eba59ffd14ddad2bbb7fcecd3538245febe92e (patch)
tree0fd09bee3b4f3802d902035aa19647e5bff06941 /meta/classes
parentf139832667058ee9dc0f4f03733d697bb0179981 (diff)
downloadpoky-d1eba59ffd14ddad2bbb7fcecd3538245febe92e.tar.gz
Multilib: Fix RDEPENDS in libc-package.bbclass, useradd.bbclass...
MLPREFIX is needed in RDEPENDS for multilib build (From OE-Core rev: 380efadd5640e5b57e710549b1ae761d0d3b3792) 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 095d04b..a966c26 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -57,7 +57,7 @@ python populate_packages_append () {
57 prerm += d.getVar('gconf_prerm', True) 57 prerm += d.getVar('gconf_prerm', True)
58 d.setVar('pkg_prerm_%s' % pkg, prerm) 58 d.setVar('pkg_prerm_%s' % pkg, prerm)
59 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" 59 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
60 rdepends += " gconf" 60 rdepends += ' ' + d.getVar('MLPREFIX') + 'gconf'
61 d.setVar("RDEPENDS_%s" % pkg, rdepends) 61 d.setVar("RDEPENDS_%s" % pkg, rdepends)
62 62
63} 63}
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 () {
257 else: 257 else:
258 libc_name = name 258 libc_name = name
259 d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ 259 d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \
260 % (bpn, libc_name))) 260 % (d.getVar('MLPREFIX') + bpn, libc_name)))
261 261
262 commands = {} 262 commands = {}
263 263
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 () {
201 201
202 # RDEPENDS setup 202 # RDEPENDS setup
203 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" 203 rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or ""
204 rdepends += " base-passwd shadow" 204 rdepends += ' ' + d.getVar('MLPREFIX') + 'base-passwd'
205 rdepends += ' ' + d.getVar('MLPREFIX') + 'shadow'
205 d.setVar("RDEPENDS_%s" % pkg, rdepends) 206 d.setVar("RDEPENDS_%s" % pkg, rdepends)
206 207
207 # Add the user/group preinstall scripts and RDEPENDS requirements 208 # Add the user/group preinstall scripts and RDEPENDS requirements