diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-05-08 17:39:22 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 12:26:26 +0100 |
| commit | 2e14dbb7f85532220f9aec293ddd4143fae8407b (patch) | |
| tree | 0dbe0a1609e47c03edbefd5c5bec598decf5c2a0 | |
| parent | 7996ca20c24157aee259bfa88b6d7743511d5eff (diff) | |
| download | openembedded-core-contrib-2e14dbb7f85532220f9aec293ddd4143fae8407b.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]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 3 |
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 () { 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) |