summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-05-08 17:39:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-11 12:27:22 +0100
commita4d931edd143c94f507db784e58ba120138ae1cc (patch)
tree3b27d7ea2fe9e489cc96dbe9f3e9e6ae1f88ef4d /meta
parent47013aa9773e5f1a7d02b5e8dd485d1166cf7203 (diff)
downloadpoky-a4d931edd143c94f507db784e58ba120138ae1cc.tar.gz
update-rc.d: Handle multilib case for initscripts
When building multilib, we also have to add the multlib prefix otherwise we get a WARNING: WARNING: Multilib QA Issue: lib32-dbus package lib32-dbus - suspicious values 'initscripts-functions' in RDEPENDS [YOCTO #6164] (From OE-Core rev: 2e14dbb7f85532220f9aec293ddd4143fae8407b) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/update-rc.d.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 81cc97621a..56eef4e06d 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -79,7 +79,8 @@ python populate_packages_updatercd () {
79 return 79 return
80 statement = "grep -q -w '/etc/init.d/functions' %s" % path 80 statement = "grep -q -w '/etc/init.d/functions' %s" % path
81 if subprocess.call(statement, shell=True) == 0: 81 if subprocess.call(statement, shell=True) == 0:
82 d.appendVar('RDEPENDS_' + pkg, ' initscripts-functions') 82 mlprefix = d.getVar('MLPREFIX', True) or ""
83 d.appendVar('RDEPENDS_' + pkg, ' %sinitscripts-functions' % (mlprefix))
83 84
84 def update_rcd_package(pkg): 85 def update_rcd_package(pkg):
85 bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg) 86 bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg)