mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
rsyslog: upgrade 8.2006.0->8.2012.0
new version no longer includes rsyslog.service,
so I copied over the same from 8.2006.
(git version carries it now in ./platform)
referenced rsyslog (upstream) commit id:
cfd07503ba055100a84d75d1a78a5c6cceb9fdab
Ptest Results: (Timeout 800) (qemux86-64)
2006 2012
================
TOTAL: 411 424
PASS: 361 372
SKIP: 39 41
XFAIL: 0 0
FAIL: 11 11
XPASS: 0 0
ERROR: 0 0
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,21 @@
|
||||
[Unit]
|
||||
Description=System Logging Service
|
||||
Requires=syslog.socket
|
||||
Wants=network.target network-online.target
|
||||
After=network.target network-online.target
|
||||
Documentation=man:rsyslogd(8)
|
||||
Documentation=http://www.rsyslog.com/doc/
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
ExecStart=@sbindir@/rsyslogd -n -iNONE
|
||||
StandardOutput=null
|
||||
Restart=on-failure
|
||||
|
||||
# Increase the default a bit in order to allow many simultaneous
|
||||
# files to be monitored, we might need a lot of fds.
|
||||
LimitNOFILE=16384
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Alias=syslog.service
|
||||
+6
-4
@@ -21,6 +21,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t
|
||||
file://initscript \
|
||||
file://rsyslog.conf \
|
||||
file://rsyslog.logrotate \
|
||||
file://rsyslog.service \
|
||||
file://use-pkgconfig-to-check-libgcrypt.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
@@ -29,8 +30,8 @@ SRC_URI_append_libc-musl = " \
|
||||
file://0001-Include-sys-time-h.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "33de768941953ceeca9d1a437b47891b"
|
||||
SRC_URI[sha256sum] = "d9589e64866f2fdc5636af4cae9d60ebf1e3257bb84b81ee953ede6a05878e97"
|
||||
SRC_URI[md5sum] = "2a64947e3d157c0198609aabd37be42f"
|
||||
SRC_URI[sha256sum] = "d74cf571e6bcdf8a4c19974afd5e78a05356191390c2f80605a9004d1c587a0e"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||
@@ -147,8 +148,9 @@ do_install_append() {
|
||||
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
|
||||
install -d ${D}${systemd_system_unitdir}
|
||||
install -m 644 ${WORKDIR}/rsyslog.service ${D}${systemd_system_unitdir}
|
||||
sed -i -e "s,@sbindir\@,$(sbindir),g" ${D}${systemd_system_unitdir}/rsyslog.service
|
||||
fi
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user