From: Saul Wold <sgw@linux.intel.com>
Date: Fri, 9 May 2014 00:39:22 +0000 (-0700)
Subject: update-rc.d: Handle multilib case for initscripts
X-Git-Tag: 2015-4~2849
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2e14dbb7f85532220f9aec293ddd4143fae8407b;p=openembedded-core.git

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]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

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 () {
             return
         statement = "grep -q -w '/etc/init.d/functions' %s" % path
         if subprocess.call(statement, shell=True) == 0:
-            d.appendVar('RDEPENDS_' + pkg, ' initscripts-functions')
+            mlprefix = d.getVar('MLPREFIX', True) or ""
+            d.appendVar('RDEPENDS_' + pkg, ' %sinitscripts-functions' % (mlprefix))
 
     def update_rcd_package(pkg):
         bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg)