aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-02-17 07:44:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-27 14:46:16 +0000
commit210e4ff3848b60073c9aa3c3a4fa2e4d560cfd19 (patch)
treeeff69f0f55c61da39467bd83faa8f9efd1a1136f
parent6fa5293e6628ab0bb93da1c6e622194286c9d957 (diff)
downloadopenembedded-core-contrib-210e4ff3848b60073c9aa3c3a4fa2e4d560cfd19.tar.gz
update-rc.d: QA regression.
I noticed many new QA warning with arm64 mulitlib suspicious values 'initd-functions-dev' in RRECOMMENDS [multilib] I believe this is a regression via commit http://cgit.openembedded.org/openembedded-core/commit/meta/classes/update-rc.d.bbclass?id=cdcebd81c872cb7386c658998e27cf24e1d0447c (From OE-Core rev: 223119dc96d2e37e3788df630d1995bf56dc156a) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-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 e1e0e04876..06e3b21396 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -91,7 +91,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, ' initd-functions')
+ mlprefix = d.getVar('MLPREFIX') or ""
+ d.appendVar('RDEPENDS_' + pkg, ' %sinitd-functions' % (mlprefix))
def update_rcd_package(pkg):
bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg)