mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-03 14:19:52 +00:00
Code Issues Projects Releases Wiki Activity

rsyslog: don't use update-alternatives to manage init script

Browse Source 
Also, explicitly conflict with other syslog providers.

[YOCTO #10433]

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Markus Lehtonen
2016-11-21 17:20:45 +02:00
committed by Martin Jansa
parent 7ee1001491
commit 37ff1e842b
1 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
+4 -30
View File
@@ -29,7 +29,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t
SRC_URI[md5sum] = "ad0f25f429aa2daa326732950a5eeb6c" SRC_URI[md5sum] = "ad0f25f429aa2daa326732950a5eeb6c"
SRC_URI[sha256sum] = "06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca" 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" EXTRA_OECONF += "--disable-generate-man-pages"
@@ -114,7 +114,7 @@ do_install_ptest() {
do_install_append() { do_install_append() {
install -d "${D}${sysconfdir}/init.d" 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.conf ${D}${sysconfdir}/rsyslog.conf
install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog
} }
@@ -124,20 +124,10 @@ FILES_${PN} += "${bindir}"
INITSCRIPT_NAME = "syslog" INITSCRIPT_NAME = "syslog"
INITSCRIPT_PARAMS = "defaults" 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" CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng"
RPROVIDES_${PN} += "${PN}-systemd" RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd"
@@ -154,19 +144,3 @@ VALGRIND_arm = ""
VALGRIND_aarch64 = "" VALGRIND_aarch64 = ""
RDEPENDS_${PN}-ptest += "make diffutils gzip bash gawk coreutils procps" RDEPENDS_${PN}-ptest += "make diffutils gzip bash gawk coreutils procps"
RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" 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')))
}