mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

Revert "logrotate: 3.8.8 -> 3.8.9"

Browse Source 
This reverts commit 0a69248db7.

The update causes QA failures on the autobuilder.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2015-02-23 16:11:20 +00:00
parent 687c797728
commit 04faba56f1
4 changed files with 48 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
+23 -25
View File
@@ -1,12 +1,9 @@
From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001 Act as the "mv" command when rotate log
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 17 Feb 2015 21:08:07 -0800
Subject: [PATCH] Act as the "mv" command when rotate log
Act as the "mv" command when rotate log, first rename, if failed, then Act as the "mv" command when rotate log, first rename, if failed, then
read and write. read and write.
Upstream-Status: Pending Upstream-Status: Submitted
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
@@ -14,10 +11,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
1 file changed, 56 insertions(+), 9 deletions(-) 1 file changed, 56 insertions(+), 9 deletions(-)
diff --git a/logrotate.c b/logrotate.c diff --git a/logrotate.c b/logrotate.c
index 05e74c9..616418f 100644 index 174a26b..b18b629 100644
--- a/logrotate.c --- a/logrotate.c
+++ b/logrotate.c +++ b/logrotate.c
@@ -1000,6 +1000,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force) @@ -906,6 +906,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force)
return 0; return 0;
} }
@@ -71,7 +68,7 @@ index 05e74c9..616418f 100644
int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
struct logNames *rotNames) struct logNames *rotNames)
{ {
@@ -1364,15 +1411,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state, @@ -1268,15 +1315,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
} }
message(MESS_DEBUG, message(MESS_DEBUG,
@@ -90,21 +87,22 @@ index 05e74c9..616418f 100644
oldName, newName, strerror(errno)); oldName, newName, strerror(errno));
hasErrors = 1; hasErrors = 1;
} }
@@ -1511,10 +1558,10 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state, @@ -1408,11 +1455,11 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
return 1;
} }
}
- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], #endif /* WITH_ACL */
+ message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum], - message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
tmpFilename); + message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
- if (!debug && !hasErrors && rename(log->files[logNum], tmpFilename)) { rotNames->finalName);
- message(MESS_ERROR, "failed to rename %s to %s: %s\n", if (!debug && !hasErrors &&
+ if (!debug && !hasErrors && mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) { - rename(log->files[logNum], rotNames->finalName)) {
+ message(MESS_ERROR, "failed to move %s to %s: %s\n", - message(MESS_ERROR, "failed to rename %s to %s: %s\n",
log->files[logNum], tmpFilename, + mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
strerror(errno)); + message(MESS_ERROR, "failed to move %s to %s: %s\n",
if (errno == ENOENT) { log->files[logNum], rotNames->finalName,
@@ -1912,7 +1959,7 @@ int rotateLogSet(struct logInfo *log, int force) strerror(errno));
hasErrors = 1;
@@ -1775,7 +1822,7 @@ int rotateLogSet(struct logInfo *log, int force)
return hasErrors; return hasErrors;
} }
@@ -113,7 +111,7 @@ index 05e74c9..616418f 100644
{ {
struct logState *p; struct logState *p;
FILE *f; FILE *f;
@@ -2076,7 +2123,7 @@ static int writeState(char *stateFilename) @@ -1939,7 +1986,7 @@ static int writeState(char *stateFilename)
fclose(f); fclose(f);
if (error == 0) { if (error == 0) {
@@ -122,7 +120,7 @@ index 05e74c9..616418f 100644
unlink(tmpFilename); unlink(tmpFilename);
error = 1; error = 1;
message(MESS_ERROR, "error renaming temp state file %s\n", message(MESS_ERROR, "error renaming temp state file %s\n",
@@ -2362,7 +2409,7 @@ int main(int argc, const char **argv) @@ -2223,7 +2270,7 @@ int main(int argc, const char **argv)
rc |= rotateLogSet(log, force); rc |= rotateLogSet(log, force);
if (!debug) if (!debug)
@@ -132,5 +130,5 @@ index 05e74c9..616418f 100644
return (rc != 0); return (rc != 0);
} }
-- --
1.7.9.5 1.7.10.4
meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
+13 -17
View File
@@ -1,12 +1,9 @@
From 263212af7b7fe1083f777255d91f029401391e4f Mon Sep 17 00:00:00 2001 Disable the check for different filesystems
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 17 Feb 2015 21:18:39 -0800
Subject: [PATCH] Disable the check for different filesystems
The logrotate supports rotate log across different filesystems now, so The logrotate supports rotate log across different filesystems now, so
disable the check for different filesystems. disable the check for different filesystems.
Upstream-Status: Pending Upstream-Status: Submitted
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
@@ -14,25 +11,24 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
1 file changed, 9 deletions(-) 1 file changed, 9 deletions(-)
diff --git a/config.c b/config.c diff --git a/config.c b/config.c
index dbbf563..64e66f6 100644 index e0eadb7..c23092f 100644
--- a/config.c --- a/config.c
+++ b/config.c +++ b/config.c
@@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) @@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
goto error; 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 | LOG_FLAG_TMPFILENAME))) { - && !(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,
- lineNum, newlog->oldDir, newlog->files[i]); - lineNum, newlog->oldDir, newlog->files[i]);
- goto error; - goto error;
- } - }
} }
} }
-- --
1.7.9.5 1.7.9.5
meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
+10 -16
View File
@@ -1,32 +1,26 @@
From e0b0fe30e9c49234994a20a86aacfaf80e690087 Mon Sep 17 00:00:00 2001 Update the manual
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 17 Feb 2015 21:14:37 -0800
Subject: [PATCH] Update the manual
Update the manual for rotating on different filesystems. Update the manual for rotating on different filesystems.
Upstream-Status: Pending Upstream-Status: Submitted
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
logrotate.8 | 10 ++++------ logrotate.8 | 7 +++----
1 file changed, 4 insertions(+), 6 deletions(-) 1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/logrotate.8 b/logrotate.8 diff --git a/logrotate.8 b/logrotate.8
index e4e5f48..84407d0 100644 index 8b34167..5f15432 100644
--- a/logrotate.8 --- a/logrotate.8
+++ b/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 .TP
\fBolddir \fIdirectory\fR \fBolddir \fIdirectory\fR
-Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
-on the same physical device as the log file being rotated, unless \fBcopy\fR, -must be on the same physical device as the log file being rotated,
-\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR -and is assumed to be relative to the directory holding the log file
-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 -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 -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 +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 +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 +versions of the log end up in \fIdirectory\fR. This option may be
@@ -34,5 +28,5 @@ index e4e5f48..84407d0 100644
.TP .TP
-- --
1.7.9.5 1.7.4.1
meta/recipes-extended/logrotate/logrotate_3.8.9.bb → meta/recipes-extended/logrotate/logrotate_3.8.8.bb
+2 -2
View File
@@ -16,8 +16,8 @@ SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.g
file://disable-check-different-filesystems.patch \ file://disable-check-different-filesystems.patch \
" "
SRC_URI[md5sum] = "2660f30742da79870d15d042b07829f6" SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca"
SRC_URI[sha256sum] = "700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7" SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f"
PACKAGECONFIG ?= "\ PACKAGECONFIG ?= "\
${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \