mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 06:49:33 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
01c7d083ef
commit
c924c07dab
@@ -7,19 +7,20 @@ Upstream-Status: Submitted
|
|||||||
|
|
||||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||||
---
|
---
|
||||||
config.c | 8 --------
|
config.c | 9 ---------
|
||||||
1 files changed, 0 insertions(+), 8 deletions(-)
|
1 file changed, 9 deletions(-)
|
||||||
|
|
||||||
diff --git a/config.c b/config.c
|
diff --git a/config.c b/config.c
|
||||||
index a85d1df..24575b3 100644
|
index e0eadb7..c23092f 100644
|
||||||
--- a/config.c
|
--- a/config.c
|
||||||
+++ b/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));
|
dirName, strerror(errno));
|
||||||
goto error;
|
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,
|
- message(MESS_ERROR,
|
||||||
- "%s:%d olddir %s and log file %s "
|
- "%s:%d olddir %s and log file %s "
|
||||||
- "are on different devices\n", configFile,
|
- "are on different devices\n", configFile,
|
||||||
@@ -30,5 +31,4 @@ index a85d1df..24575b3 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
1.7.4.1
|
1.7.9.5
|
||||||
|
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
|
|||||||
|
|
||||||
SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
|
SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
|
||||||
file://act-as-mv-when-rotate.patch \
|
file://act-as-mv-when-rotate.patch \
|
||||||
file://disable-check-different-filesystems.patch \
|
|
||||||
file://update-the-manual.patch \
|
file://update-the-manual.patch \
|
||||||
|
file://disable-check-different-filesystems.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
|
SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca"
|
||||||
SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
|
SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f"
|
||||||
|
|
||||||
PACKAGECONFIG ?= "\
|
PACKAGECONFIG ?= "\
|
||||||
${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
|
${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
|
||||||
Reference in New Issue
Block a user