From cdcebd81c872cb7386c658998e27cf24e1d0447c 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] Signed-off-by: Markus Lehtonen --- meta/recipes-core/initscripts/initscripts_1.0.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/initscripts') 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" KERNEL_VERSION = "" -inherit update-alternatives DEPENDS_append = " update-rc.d-native" PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions ${PN}-sushell" -RDEPENDS_${PN} = "${PN}-functions \ +RDEPENDS_${PN} = "initd-functions \ ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ " +RPROVIDES_${PN}-functions = "initd-functions" +RCONFLICTS_${PN}-functions = "lsbinitscripts" FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" FILES_${PN}-sushell = "${base_sbindir}/sushell" -ALTERNATIVE_PRIORITY_${PN}-functions = "90" -ALTERNATIVE_${PN}-functions = "functions" -ALTERNATIVE_LINK_NAME[functions] = "${sysconfdir}/init.d/functions" - HALTARGS ?= "-d -f" do_configure() { -- cgit 1.2.3-korg