From 9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 19 Sep 2011 15:07:30 +0100 Subject: scripts/combo-layer: fix still overzealous regex in default hook script 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/combo-layer-hook-default.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh index e535d5f4cc..8b148aca07 100755 --- a/scripts/combo-layer-hook-default.sh +++ b/scripts/combo-layer-hook-default.sh @@ -10,4 +10,4 @@ rev=$2 reponame=$3 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 -- cgit v1.2.3