summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-11-18 14:08:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-02 11:25:33 +0000
commitc83eb10f70b714ce3a8c165fad547d800f3ed27d (patch)
treeff72d42901b2b6aa8c23fdf0e3b192abf5df6b0f /meta/recipes-extended
parentd5f42075e6b344f2719e588da5aebd3ff4b4e6e0 (diff)
downloadpoky-c83eb10f70b714ce3a8c165fad547d800f3ed27d.tar.gz
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] (From OE-Core rev: 988aad01b20c18a8850db0ad6dc547525d94116c) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc12
1 files changed, 1 insertions, 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 \
11 file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \ 11 file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \
12 " 12 "
13 13
14inherit update-rc.d update-alternatives systemd 14inherit update-rc.d systemd
15 15
16SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \ 16SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
17 file://no-strip-install.patch \ 17 file://no-strip-install.patch \
@@ -58,16 +58,6 @@ do_install () {
58 58
59FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}" 59FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}"
60 60
61ALTERNATIVE_PRIORITY = "100"
62
63ALTERNATIVE_${PN} = "syslogd klogd"
64
65ALTERNATIVE_${PN}-doc = "syslogd.8"
66ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
67
68ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd"
69ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd"
70
71pkg_prerm_${PN} () { 61pkg_prerm_${PN} () {
72 if test "x$D" = "x"; then 62 if test "x$D" = "x"; then
73 if test "$1" = "upgrade" -o "$1" = "remove"; then 63 if test "$1" = "upgrade" -o "$1" = "remove"; then