diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-extended/logrotate/logrotate_3.8.8.bb (renamed from meta/recipes-extended/logrotate/logrotate_3.8.7.bb) | 6 |
2 files changed, 10 insertions, 10 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 Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- - config.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) + config.c | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/config.c b/config.c -index a85d1df..24575b3 100644 +index e0eadb7..c23092f 100644 --- a/config.c +++ b/config.c -@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) +@@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) dirName, strerror(errno)); goto error; } - -- if (sb.st_dev != sb2.st_dev) { +- if (sb.st_dev != sb2.st_dev +- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { - message(MESS_ERROR, - "%s:%d olddir %s and log file %s " - "are on different devices\n", configFile, @@ -30,5 +31,4 @@ index a85d1df..24575b3 100644 } -- -1.7.4.1 - +1.7.9.5 diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb index faa8e0264f..133f6d7038 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ file://act-as-mv-when-rotate.patch \ - file://disable-check-different-filesystems.patch \ file://update-the-manual.patch \ + file://disable-check-different-filesystems.patch \ " -SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213" -SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64" +SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca" +SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f" PACKAGECONFIG ?= "\ ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ |