update-rc.d: Handle multilib case for initsctipts

PATCH New Saul Wold 1 participant 1 message May 9, 2014

Share & tools

Saul Wold

author

2014-05-09 00:39 UTC #0 lore raw

PATCH 1/1 update-rc.d: Handle multilib case for initsctipts

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 <[email protected]>

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

meta/classes/update-rc.d.bbclass +2 -1

index 81cc976..56eef4e 100644
@@ -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)

Signature · 1 line

1.8.3.1