diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-23 16:11:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-23 17:37:41 +0000 |
commit | 04faba56f1c8637d6b6ad71a67f31fce11ad6dc1 (patch) | |
tree | 9aeea902c2132d78c8c0bdea92fb86ff6bf953c1 /meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | |
parent | 687c79772819f98359a21eda2b62e9536885a64f (diff) | |
download | poky-04faba56f1c8637d6b6ad71a67f31fce11ad6dc1.tar.gz |
Revert "logrotate: 3.8.8 -> 3.8.9"
This reverts commit 0a69248db774f169318fc5954c805f0a7e8803dc.
The update causes QA failures on the autobuilder.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch')
-rw-r--r-- | meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch index 0535a45e08..43ebcffbae 100644 --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | |||
@@ -1,12 +1,9 @@ | |||
1 | From 263212af7b7fe1083f777255d91f029401391e4f Mon Sep 17 00:00:00 2001 | 1 | Disable the check for different filesystems |
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 17 Feb 2015 21:18:39 -0800 | ||
4 | Subject: [PATCH] Disable the check for different filesystems | ||
5 | 2 | ||
6 | The logrotate supports rotate log across different filesystems now, so | 3 | The logrotate supports rotate log across different filesystems now, so |
7 | disable the check for different filesystems. | 4 | disable the check for different filesystems. |
8 | 5 | ||
9 | Upstream-Status: Pending | 6 | Upstream-Status: Submitted |
10 | 7 | ||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
12 | --- | 9 | --- |
@@ -14,25 +11,24 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
14 | 1 file changed, 9 deletions(-) | 11 | 1 file changed, 9 deletions(-) |
15 | 12 | ||
16 | diff --git a/config.c b/config.c | 13 | diff --git a/config.c b/config.c |
17 | index dbbf563..64e66f6 100644 | 14 | index e0eadb7..c23092f 100644 |
18 | --- a/config.c | 15 | --- a/config.c |
19 | +++ b/config.c | 16 | +++ b/config.c |
20 | @@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) | 17 | @@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) |
21 | goto error; | 18 | dirName, strerror(errno)); |
22 | } | 19 | goto error; |
23 | } | 20 | } |
24 | - | 21 | - |
25 | - if (sb.st_dev != sb2.st_dev | 22 | - if (sb.st_dev != sb2.st_dev |
26 | - && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) { | 23 | - && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { |
27 | - message(MESS_ERROR, | 24 | - message(MESS_ERROR, |
28 | - "%s:%d olddir %s and log file %s " | 25 | - "%s:%d olddir %s and log file %s " |
29 | - "are on different devices\n", configFile, | 26 | - "are on different devices\n", configFile, |
30 | - lineNum, newlog->oldDir, newlog->files[i]); | 27 | - lineNum, newlog->oldDir, newlog->files[i]); |
31 | - goto error; | 28 | - goto error; |
32 | - } | 29 | - } |
33 | } | 30 | } |
34 | } | 31 | } |
35 | 32 | ||
36 | -- | 33 | -- |
37 | 1.7.9.5 | 34 | 1.7.9.5 |
38 | |||