diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-12-07 12:08:25 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-06 10:13:55 +0000 |
| commit | 61ed8ab4357c03a336850e67ddc05f942806310f (patch) | |
| tree | 74553acc22f5f5a148ba4d3c63668330b8e79016 /meta/classes/update-rc.d.bbclass | |
| parent | a173395b8c98ca147bc9bbf840f9d9574d435b75 (diff) | |
| download | poky-61ed8ab4357c03a336850e67ddc05f942806310f.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: 2daffb998585a2f781cbbfb1a959379e01c40f0a)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
(cherry picked from commit cdcebd81c872cb7386c658998e27cf24e1d0447c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/update-rc.d.bbclass')
| -rw-r--r-- | meta/classes/update-rc.d.bbclass | 3 |
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) |