diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-12-07 12:08:25 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:33 +0000 |
commit | 6ceac4eabf231d28b24ab9388e0c5d61c9868843 (patch) | |
tree | 719931ec76760c91f4992566ff314d2eda3d2d92 /meta/recipes-core/initscripts | |
parent | c83eb10f70b714ce3a8c165fad547d800f3ed27d (diff) | |
download | poky-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/recipes-core/initscripts')
-rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index fea4f22e95..1167735756 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
@@ -43,21 +43,18 @@ SRC_URI_append_arm = " file://alignment.sh" | |||
43 | 43 | ||
44 | KERNEL_VERSION = "" | 44 | KERNEL_VERSION = "" |
45 | 45 | ||
46 | inherit update-alternatives | ||
47 | DEPENDS_append = " update-rc.d-native" | 46 | DEPENDS_append = " update-rc.d-native" |
48 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 47 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
49 | 48 | ||
50 | PACKAGES =+ "${PN}-functions ${PN}-sushell" | 49 | PACKAGES =+ "${PN}-functions ${PN}-sushell" |
51 | RDEPENDS_${PN} = "${PN}-functions \ | 50 | RDEPENDS_${PN} = "initd-functions \ |
52 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ | 51 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ |
53 | " | 52 | " |
53 | RPROVIDES_${PN}-functions = "initd-functions" | ||
54 | RCONFLICTS_${PN}-functions = "lsbinitscripts" | ||
54 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" | 55 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" |
55 | FILES_${PN}-sushell = "${base_sbindir}/sushell" | 56 | FILES_${PN}-sushell = "${base_sbindir}/sushell" |
56 | 57 | ||
57 | ALTERNATIVE_PRIORITY_${PN}-functions = "90" | ||
58 | ALTERNATIVE_${PN}-functions = "functions" | ||
59 | ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions" | ||
60 | |||
61 | HALTARGS ?= "-d -f" | 58 | HALTARGS ?= "-d -f" |
62 | 59 | ||
63 | do_configure() { | 60 | do_configure() { |