diff options
3 files changed, 34 insertions, 2 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 new file mode 100644 index 0000000000..90d3ef2727 --- /dev/null +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch @@ -0,0 +1,31 @@ +From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 +From: Li xin <lixin.fnst@cn.fujitsu.com> +Date: Wed, 17 Jun 2015 14:46:30 +0900 +Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start + successfully,so modify it. + +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(-) + +diff --git a/contrib/systemd/syslog-ng.service b/contrib/systemd/syslog-ng.service +index fc16f8d..8e09deb 100644 +--- a/contrib/systemd/syslog-ng.service ++++ b/contrib/systemd/syslog-ng.service +@@ -3,9 +3,8 @@ Description=System Logger Daemon + Documentation=man:syslog-ng(8) + + [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 + Restart=on-failure +-- +1.8.4.2 + diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index b9ca880c6a..a990bf8e1f 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -28,7 +28,7 @@ EXTRA_OECONF = " \ --enable-dynamic-linking \ --disable-sub-streams \ --disable-pacct \ - --localstatedir=${localstatedir}/run/${BPN} \ + --localstatedir=${localstatedir}/lib/${BPN} \ --sysconfdir=${sysconfdir}/${BPN} \ --with-module-dir=${libdir}/${BPN} \ --with-sysroot=${STAGING_DIR_HOST} \ @@ -67,7 +67,7 @@ do_install_append() { install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${BPN} install -d ${D}/${sysconfdir}/default/volatiles/ install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng - + install -d ${D}/${localstatedir}/lib/${BPN} # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run } diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb index b54842030c..e8940c0abb 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.5.4.1.bb @@ -15,6 +15,7 @@ SRC_URI += " \ file://dbifix.patch \ file://rewrite-expr-grammar.ym-Free-up-token.patch \ file://logwriter-dont-allocate-a-new-buffer.patch \ + file://syslog-ng.service-the-syslog-ng-service.patch \ " SRC_URI[md5sum] = "ff3bf223ebafbaa92b69a2d5b729f368" |