From 988aad01b20c18a8850db0ad6dc547525d94116c Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 18 Nov 2016 14:08:28 +0200 Subject: sysklogd: don't use update-alternatives Using update-alternatives for managing init scripts has proved to be problematic. And, sysklogd rconflicts with other syslog daemons so there is no point in using update-alternatives from this perspective, either. [YOCTO #10944] Signed-off-by: Markus Lehtonen --- meta/recipes-extended/sysklogd/sysklogd.inc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index e9a4a02192..1a537fabf4 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \ " -inherit update-rc.d update-alternatives systemd +inherit update-rc.d systemd SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \ file://no-strip-install.patch \ @@ -58,16 +58,6 @@ do_install () { FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "syslogd klogd" - -ALTERNATIVE_${PN}-doc = "syslogd.8" -ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" - -ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" -ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd" - pkg_prerm_${PN} () { if test "x$D" = "x"; then if test "$1" = "upgrade" -o "$1" = "remove"; then -- cgit 1.2.3-korg