Fix for combo-layer default hook script

Otavio Salvador reported another issue with the hook script which I have fixed; the circumstances are briefly described in the patch.

The following changes since commit 81274f4488fbc4d68d150870735ec0181b60b451:

freetype: disable bzip2 compressed font support (2011-09-19 13:14:03 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/combo-layer-hook-fix-2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/combo-layer-hook-fix-2

Paul Eggleton (1):
scripts/combo-layer: fix still overzealous regex in default hook
script

 scripts/combo-layer-hook-default.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

1.7.4.1

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.

---
 scripts/combo-layer-hook-default.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index e535d5f..8b148ac 100755
@@ -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

1.7.4.1

Tested and this works as expected :-) Thanks by fixing it.

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Merged into OE-Core

Thanks
Sau!