summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-04-17 16:26:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-04-17 16:26:17 +0200
commit4a4bd6f6c8890a8f8887ad6fe08444d35b392ebd (patch)
tree3fcd112b2f925323c1da8d370bab538007373dc9 /patches
parentf8eb5479308ebdbae06dfc7bfb4552746daac243 (diff)
downloadptxdist-4a4bd6f6c8890a8f8887ad6fe08444d35b392ebd.tar.gz
ptxdist-4a4bd6f6c8890a8f8887ad6fe08444d35b392ebd.tar.xz
rsyslog: remove old patch
This patch is now upstream. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch25
-rw-r--r--patches/rsyslog-5.8.13/series4
2 files changed, 0 insertions, 29 deletions
diff --git a/patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch b/patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch
deleted file mode 100644
index 4717cac05..000000000
--- a/patches/rsyslog-5.8.13/0001-fix-unitfile-for-newer-systemd-implementation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Gavin Schenk <g.schenk@eckelmann.de>
-Date: Wed, 19 Sep 2012 12:21:01 +0200
-Subject: [PATCH] fix unitfile for newer systemd implementation
-
----
- rsyslog.service.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/rsyslog.service.in b/rsyslog.service.in
-index aa9e5db..9f91923 100644
---- a/rsyslog.service.in
-+++ b/rsyslog.service.in
-@@ -1,8 +1,8 @@
- [Unit]
- Description=System Logging Service
-+Requires=syslog.socket
-
- [Service]
--ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
- ExecStart=@sbindir@/rsyslogd -n -c5
- Sockets=syslog.socket
- StandardOutput=null
---
-1.7.0.4
-
diff --git a/patches/rsyslog-5.8.13/series b/patches/rsyslog-5.8.13/series
deleted file mode 100644
index d729c926c..000000000
--- a/patches/rsyslog-5.8.13/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-fix-unitfile-for-newer-systemd-implementation.patch
-# 9cdaaf0fca11973761c6ad8ccefad8c4 - git-ptx-patches magic