From 37ff1e842b9e87787ff2eec10f8bdf7de445e4ad Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Mon, 21 Nov 2016 17:20:45 +0200 Subject: rsyslog: don't use update-alternatives to manage init script Also, explicitly conflict with other syslog providers. [YOCTO #10433] Signed-off-by: Markus Lehtonen Signed-off-by: Martin Jansa --- meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 34 +++------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb index 4e2c12279d..c0e0a6d69c 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb @@ -29,7 +29,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t SRC_URI[md5sum] = "ad0f25f429aa2daa326732950a5eeb6c" SRC_URI[sha256sum] = "06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca" -inherit autotools pkgconfig systemd update-rc.d update-alternatives ptest +inherit autotools pkgconfig systemd update-rc.d ptest EXTRA_OECONF += "--disable-generate-man-pages" @@ -114,7 +114,7 @@ do_install_ptest() { do_install_append() { install -d "${D}${sysconfdir}/init.d" - install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog.${BPN} + install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog } @@ -124,20 +124,10 @@ FILES_${PN} += "${bindir}" INITSCRIPT_NAME = "syslog" INITSCRIPT_PARAMS = "defaults" -# higher than sysklogd's 100 -ALTERNATIVE_PRIORITY = "110" - -ALTERNATIVE_${PN} = "syslogd syslog-conf syslog-logrotate" - -ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" -ALTERNATIVE_TARGET[syslogd] = "${sbindir}/rsyslogd" -ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" -ALTERNATIVE_TARGET[syslog-conf] = "${sysconfdir}/rsyslog.conf" -ALTERNATIVE_LINK_NAME[syslog-logrotate] = "${sysconfdir}/logrotate.d/syslog" -ALTERNATIVE_TARGET[syslog-logrotate] = "${sysconfdir}/logrotate.rsyslog" - CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" +RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng" + RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" @@ -154,19 +144,3 @@ VALGRIND_arm = "" VALGRIND_aarch64 = "" RDEPENDS_${PN}-ptest += "make diffutils gzip bash gawk coreutils procps" RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" - -# no syslog-init for systemd -python () { - if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - pn = d.getVar('PN') - sysconfdir = d.getVar('sysconfdir') - d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') - d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) - d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir'), d.getVar('BPN'))) - - if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): - pn = d.getVar('PN') - d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') - d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir'))) - d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir'))) -} -- cgit 1.2.3-korg