Patchwork [RC,Fixes,01/19] scripts/combo-layer: fix still overzealous regex in default hook script

mail settings
Submitter Saul Wold
Date Sept. 21, 2011, 9:39 a.m.
Message ID <>
Download mbox | patch
Permalink /patch/11831/
State New, archived
Headers show


Saul Wold - Sept. 21, 2011, 9:39 a.m.
From: Paul Eggleton <>

In the previous fix to this hook script (OE core revision
e7aae45414e4597e9244f86a81fbc940f73785c8) a start-of-line (^) marker was
missed, so if a commit had no Signed-off-by line but it contained an
inner patch that did, the inner patch was modified causing a "corrupt
patch" error.

Signed-off-by: Paul Eggleton <>
 scripts/ |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/scripts/ b/scripts/
index e535d5f..8b148ac 100755
--- a/scripts/
+++ b/scripts/
@@ -10,4 +10,4 @@  rev=$2
 sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
-sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
+sed -i -e "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile