From 8a51692d6e2442a8d9e66b1ff7f1a31758cae869 Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Tue, 27 Jan 2015 09:48:05 +0800 Subject: [PATCH] Linuxize: Fix several issues in the gen-patch.sh. It is detected by Paul that the generated patch contains Data instead of Date. Also we need "Fixed-by" and "Original-by" keywords for SOB blocks. Reported-by: Paul Menzel Signed-off-by: Lv Zheng --- generate/linux/gen-patch.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/generate/linux/gen-patch.sh b/generate/linux/gen-patch.sh index 316f5aa8b..1decd337b 100755 --- a/generate/linux/gen-patch.sh +++ b/generate/linux/gen-patch.sh @@ -106,9 +106,9 @@ generate_acpica_desc() AUTHOR_EMAIL="robert.moore@intel.com" fi AUTHOR="${AUTHOR_NAME} <${AUTHOR_EMAIL}>" - FORMAT="From %H Mon Sep 17 00:00:00 2001%nFrom: $COMMITTER%nData: %aD%nFrom: $AUTHOR%nSubject: [PATCH $INDEX] ACPICA: %s%n%n%b" + FORMAT="From %H Mon Sep 17 00:00:00 2001%nFrom: $COMMITTER%nDate: %aD%nFrom: $AUTHOR%nSubject: [PATCH $INDEX] ACPICA: %s%n%n%b" if [ "x$UPSTREAM" = "xyes" ]; then - FORMAT="From %H Mon Sep 17 00:00:00 2001%nFrom: $COMMITTER%nData: %aD%nFrom: $AUTHOR%nSubject: [PATCH $INDEX] ACPICA: %s%n%nACPICA commit %H%n%n%b" + FORMAT="From %H Mon Sep 17 00:00:00 2001%nFrom: $COMMITTER%nDate: %aD%nFrom: $AUTHOR%nSubject: [PATCH $INDEX] ACPICA: %s%n%nACPICA commit %H%n%n%b" fi GIT_LOG_FORMAT=`echo $FORMAT` eval "git log -c $1 -1 --format=\"$GIT_LOG_FORMAT\"" @@ -125,6 +125,12 @@ split_desc() if (match($0, /^Signed-off-by:.*/)) { if (ENVIRON["DOSOB"]==1) print $0 + } else if (match($0, /^Fixed-by:.*/)) { + if (ENVIRON["DOSOB"]==1) + print $0 + } else if (match($0, /^Original-by:.*/)) { + if (ENVIRON["DOSOB"]==1) + print $0 } else if (match($0, /^Acked-by:.*/)) { if (ENVIRON["DOSOB"]==1) print $0 @@ -142,7 +148,7 @@ split_desc() print $0 } else if (match($0, /^Link:.*/)) { if (ENVIRON["DOSOB"]==1) - print $0 + print $0 } else if (match($0, /^Reference:.*/)) { if (ENVIRON["DOSOB"]==1) print $0