summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 644728ae67..e9a4a02192 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -32,7 +32,8 @@ SYSTEMD_SERVICE_${PN} = "syslogd.service klogd.service"
32SYSTEMD_AUTO_ENABLE = "enable" 32SYSTEMD_AUTO_ENABLE = "enable"
33 33
34INITSCRIPT_NAME = "syslog" 34INITSCRIPT_NAME = "syslog"
35CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}" 35CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
36RCONFLICTS_${PN}-syslog = "rsyslog busybox-syslog syslog-ng"
36 37
37CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" 38CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
38 39
@@ -57,20 +58,15 @@ do_install () {
57 58
58FILES_${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)}"
59 60
60# sysklogd package has no internal systemd support, so we weigh busybox's 61ALTERNATIVE_PRIORITY = "100"
61# sysklogd utility over it in case of systemd
62ALTERNATIVE_PRIORITY = "${@bb.utils.contains('DISTRO_FEATURES','systemd','10','100',d)}"
63 62
64ALTERNATIVE_${PN} = "syslogd klogd syslog-conf \ 63ALTERNATIVE_${PN} = "syslogd klogd"
65 ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','syslog-init','',d)}"
66 64
67ALTERNATIVE_${PN}-doc = "syslogd.8" 65ALTERNATIVE_${PN}-doc = "syslogd.8"
68ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" 66ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
69 67
70ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" 68ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd"
71ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd" 69ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd"
72ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog"
73ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf"
74 70
75pkg_prerm_${PN} () { 71pkg_prerm_${PN} () {
76 if test "x$D" = "x"; then 72 if test "x$D" = "x"; then