From 4b181cc35a09374d79b22e34048d8e104cd6788e Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 13 Jul 2020 15:10:33 +0800 Subject: rsyslog: get alias of syslog back since upstream rsyslog commit https://github.com/rsyslog/rsyslog/pull/4317/commits/7a671da74f78047b3fd0eb65203f045de28cec0f , Alias=syslog.service is removed from service file, which will make systemctl restart syslog fail since Unit syslog.service not found when we set rsyslog to default syslog. And upstream have change the solution about pull 4317, so during next upgrade, we need to add our own rsyslog.service, refer https://github.com/rgerhards/rsyslog/commit/83d5710f074b34263322cd53fa1112aafd25b985 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb index ff6699509f..524cd9ead1 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb @@ -152,6 +152,10 @@ do_install_append() { install -d 0755 ${D}${sysconfdir}/rsyslog.d echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf fi + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + sed -i -e "s#;Requires=syslog.socket#Requires=syslog.socket#g" ${D}${systemd_system_unitdir}/rsyslog.service + sed -i -e "s#;Alias=syslog.service#Alias=syslog.service#g" ${D}${systemd_system_unitdir}/rsyslog.service + fi } FILES_${PN} += "${bindir}" -- cgit v1.2.3-54-g00ecf