diff options
| author |   Dai Caiyun <daicy.fnst@cn.fujitsu.com> | 2016-01-12 18:23:16 -0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-27 12:43:56 +0100 |
| commit | 72210ea4769d9f58477931d78c4e506ef6ad776b (patch) | |
| tree | 7f57280e0fdd2bb5303018c02362089ae9ec42a5 /meta-oe/recipes-support/syslog-ng/files | |
| parent | 19a3f18e1e4f40a2c52108765c1f91e89691ba0e (diff) | |
| download | meta-openembedded-72210ea4769d9f58477931d78c4e506ef6ad776b.tar.gz | |
syslog-ng: 3.5.4.1 -> 3.6.4
Upgrade syslog-ng from 3.5.4.1 to 3.6.4.
1) Modify the syslog-ng.service-the-syslog-ng-service.patch,since the datas has been changed.
2) Delete these patches,since they are not needed any more.
afsql-afsql_dd_insert_db-refactor.patch
deinit-the-new-config-when-reverting-to-the.patch
free-global-LogTemplateOptions.patch
still-free-the-unconsumed-item.patch
syslog-ng-verify-the-list-before-del.patch
rewrite-expr-grammar.ym-Free-up-token.patch
logwriter-dont-allocate-a-new-buffer.patch
3) Fix WARNING:
QA Issue: syslog-ng-libs rdepends on libpcre, but it isn't a build dependency? [build-deps]
QA Issue: syslog-ng rdepends on libpcre, but it isn't a build dependency? [build-deps]
4) Fix ERROR: QA Issue: non -staticdev package contains static .a library:
work/i586-poky-linux/syslog-ng/3.6.4-r0/packages-split/syslog-ng/usr/lib/syslog-ng/libtest/libsyslog-ng-test.a' [staticdev]
Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/files')
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 90d3ef2727..f53c607b41 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -8,8 +8,8 @@ Upstream-Status: pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- - contrib/systemd/syslog-ng.service | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + contrib/systemd/syslog-ng.service | 5 ++--- + 1 file changed, 2 insertion(+), 3 deletions(-) diff --git a/contrib/systemd/syslog-ng.service b/contrib/systemd/syslog-ng.service index fc16f8d..8e09deb 100644 @@ -20,11 +20,12 @@ index fc16f8d..8e09deb 100644 [Service] -Type=notify - Sockets=syslog.socket -ExecStart=/usr/sbin/syslog-ng -F -+ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid - ExecReload=/bin/kill -HUP $MAINPID - StandardOutput=null +-ExecReload=/bin/kill -HUP $MAINPID ++ExecStart=@SBINDIR@/syslog-ng -F -p @LOCALSTATEDIR@/run/syslogd.pid ++ExecReload=@BASEBINDIR@/kill -HUP $MAINPID + StandardOutput=journal + StandardError=journal Restart=on-failure -- 1.8.4.2 |