[oe-commits] Saul Wold : update-rc.d: Handle multilib case for initscripts

[git at git.openembedded.org]

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

Author: Saul Wold <sgw at linux.intel.com>
Date:   Thu May  8 17:39:22 2014 -0700

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 at linux.intel.com>

---

 meta/classes/update-rc.d.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 81cc976..56eef4e 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)