summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-07-13 15:10:33 +0800
committerKhem Raj <raj.khem@gmail.com>2020-07-13 09:01:58 -0700
commit4b181cc35a09374d79b22e34048d8e104cd6788e (patch)
tree91c2175eee044afa7c748beb2b8a5b76c5339a5d /meta-oe
parented2e3e44fd3bb739d30583ee968232dccf0a1217 (diff)
downloadmeta-openembedded-4b181cc35a09374d79b22e34048d8e104cd6788e.tar.gz
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 <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.2006.0.bb4
1 files changed, 4 insertions, 0 deletions
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 ff6699509..524cd9ead 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() {
152 install -d 0755 ${D}${sysconfdir}/rsyslog.d 152 install -d 0755 ${D}${sysconfdir}/rsyslog.d
153 echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf 153 echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf
154 fi 154 fi
155 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
156 sed -i -e "s#;Requires=syslog.socket#Requires=syslog.socket#g" ${D}${systemd_system_unitdir}/rsyslog.service
157 sed -i -e "s#;Alias=syslog.service#Alias=syslog.service#g" ${D}${systemd_system_unitdir}/rsyslog.service
158 fi
155} 159}
156 160
157FILES_${PN} += "${bindir}" 161FILES_${PN} += "${bindir}"