summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-12-07 12:08:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:25:33 +0000
commit6ceac4eabf231d28b24ab9388e0c5d61c9868843 (patch)
tree719931ec76760c91f4992566ff314d2eda3d2d92 /meta/classes
parentc83eb10f70b714ce3a8c165fad547d800f3ed27d (diff)
downloadpoky-6ceac4eabf231d28b24ab9388e0c5d61c9868843.tar.gz
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: cdcebd81c872cb7386c658998e27cf24e1d0447c) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/update-rc.d.bbclass3
1 files changed, 1 insertions, 2 deletions
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 () {
95 return 95 return
96 statement = "grep -q -w '/etc/init.d/functions' %s" % path 96 statement = "grep -q -w '/etc/init.d/functions' %s" % path
97 if subprocess.call(statement, shell=True) == 0: 97 if subprocess.call(statement, shell=True) == 0:
98 mlprefix = d.getVar('MLPREFIX') or "" 98 d.appendVar('RDEPENDS_' + pkg, ' initd-functions')
99 d.appendVar('RDEPENDS_' + pkg, ' %sinitscripts-functions' % (mlprefix))
100 99
101 def update_rcd_package(pkg): 100 def update_rcd_package(pkg):
102 bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg) 101 bb.debug(1, 'adding update-rc.d calls to preinst/postinst/prerm/postrm for %s' % pkg)