From 61ed8ab4357c03a336850e67ddc05f942806310f Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Wed, 7 Dec 2016 12:08:25 +0200 Subject: initscripts: don't use update-alternatives Stop using update-alternatives for managing /etc/init.d/functions. Also, make the initscripts-functions subpackage to (runtime) conflict with lsbinitscripts. [YOCTO #10944] (From OE-Core rev: 2daffb998585a2f781cbbfb1a959379e01c40f0a) Signed-off-by: Markus Lehtonen (cherry picked from commit cdcebd81c872cb7386c658998e27cf24e1d0447c) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/classes/update-rc.d.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/classes/update-rc.d.bbclass') diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 9ba3daccaf..c3fefea5af 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass @@ -95,8 +95,7 @@ python populate_packages_updatercd () { return statement = "grep -q -w '/etc/init.d/functions' %s" % path if subprocess.call(statement, shell=True) == 0: - mlprefix = d.getVar('MLPREFIX') or "" - d.appendVar('RDEPENDS_' + pkg, ' %sinitscripts-functions' % (mlprefix)) + d.appendVar('RDEPENDS_' + pkg, ' initd-functions') def update_rcd_package(pkg): bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg) -- cgit v1.2.3-54-g00ecf