diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-12-19 03:06:34 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-25 08:18:12 +0000 |
commit | c924c07dab6caee8b6000a2dfcc60345fd678037 (patch) | |
tree | 0a9fab132d82a83799fe5222b6292b92ba3fe78a /meta/recipes-extended/logrotate/logrotate | |
parent | 01c7d083ef63d16eac083b6c75b5d2bce0073cff (diff) | |
download | poky-c924c07dab6caee8b6000a2dfcc60345fd678037.tar.gz |
logrotate: upgrade to 3.8.8
* Upgrade to 3.8.8.
* Update disable-check-different-filesystems.patch since we still need it.
(From OE-Core rev: e7e9d4b989790e71702e06b26a45f3a380a715dd)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/logrotate/logrotate')
-rw-r--r-- | meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | 14 |
1 files changed, 7 insertions, 7 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 43068bdbd7..43ebcffbae 100644 --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | |||
@@ -7,19 +7,20 @@ Upstream-Status: Submitted | |||
7 | 7 | ||
8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
9 | --- | 9 | --- |
10 | config.c | 8 -------- | 10 | config.c | 9 --------- |
11 | 1 files changed, 0 insertions(+), 8 deletions(-) | 11 | 1 file changed, 9 deletions(-) |
12 | 12 | ||
13 | diff --git a/config.c b/config.c | 13 | diff --git a/config.c b/config.c |
14 | index a85d1df..24575b3 100644 | 14 | index e0eadb7..c23092f 100644 |
15 | --- a/config.c | 15 | --- a/config.c |
16 | +++ b/config.c | 16 | +++ b/config.c |
17 | @@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) | 17 | @@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) |
18 | dirName, strerror(errno)); | 18 | dirName, strerror(errno)); |
19 | goto error; | 19 | goto error; |
20 | } | 20 | } |
21 | - | 21 | - |
22 | - if (sb.st_dev != sb2.st_dev) { | 22 | - if (sb.st_dev != sb2.st_dev |
23 | - && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { | ||
23 | - message(MESS_ERROR, | 24 | - message(MESS_ERROR, |
24 | - "%s:%d olddir %s and log file %s " | 25 | - "%s:%d olddir %s and log file %s " |
25 | - "are on different devices\n", configFile, | 26 | - "are on different devices\n", configFile, |
@@ -30,5 +31,4 @@ index a85d1df..24575b3 100644 | |||
30 | } | 31 | } |
31 | 32 | ||
32 | -- | 33 | -- |
33 | 1.7.4.1 | 34 | 1.7.9.5 |
34 | |||