aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 16:11:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 17:37:14 +0000
commit7f0e90b56709d67f7042c0bf390b7a60bcd2a4f2 (patch)
tree096a318f673ed1fa9c54543fcb933c893a684094 /meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
parent9afc85a7be203c5a0eac1977e777a24504cb3088 (diff)
downloadopenembedded-core-contrib-7f0e90b56709d67f7042c0bf390b7a60bcd2a4f2.tar.gz
Revert "logrotate: 3.8.8 -> 3.8.9"
This reverts commit 0a69248db774f169318fc5954c805f0a7e8803dc. The update causes QA failures on the autobuilder.
Diffstat (limited to 'meta/recipes-extended/logrotate/logrotate/update-the-manual.patch')
-rw-r--r--meta/recipes-extended/logrotate/logrotate/update-the-manual.patch26
1 files changed, 10 insertions, 16 deletions
diff --git a/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch b/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
index 50d037d5a1..517acdd27e 100644
--- a/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
+++ b/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
@@ -1,32 +1,26 @@
-From e0b0fe30e9c49234994a20a86aacfaf80e690087 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Tue, 17 Feb 2015 21:14:37 -0800
-Subject: [PATCH] Update the manual
+Update the manual
Update the manual for rotating on different filesystems.
-Upstream-Status: Pending
+Upstream-Status: Submitted
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
- logrotate.8 | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
+ logrotate.8 | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/logrotate.8 b/logrotate.8
-index e4e5f48..84407d0 100644
+index 8b34167..5f15432 100644
--- a/logrotate.8
+++ b/logrotate.8
-@@ -405,12 +405,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option).
-
+@@ -374,10 +374,9 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option).
.TP
\fBolddir \fIdirectory\fR
--Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be
--on the same physical device as the log file being rotated, unless \fBcopy\fR,
--\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR
--is assumed to be relative to the directory holding the log file
+ Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
+-must be on the same physical device as the log file being rotated,
+-and is assumed to be relative to the directory holding the log file
-unless an absolute path name is specified. When this option is used all
-old versions of the log end up in \fIdirectory\fR. This option may be
-+Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
+is assumed to be relative to the directory holding the log file unless
+an absolute path name is specified. When this option is used all old
+versions of the log end up in \fIdirectory\fR. This option may be
@@ -34,5 +28,5 @@ index e4e5f48..84407d0 100644
.TP
--
-1.7.9.5
+1.7.4.1