diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-09-19 15:07:30 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-21 13:42:49 +0100 |
| commit | f45ef8d9fa0277a919b69e95442fd44db741db0a (patch) | |
| tree | 22ead9fb8bf9433e3558eb57097066dd7b30f6de | |
| parent | 6bed96c4dc267610463e056fc952822beda700a6 (diff) | |
| download | poky-f45ef8d9fa0277a919b69e95442fd44db741db0a.tar.gz | |
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.
(From OE-Core rev: 9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | scripts/combo-layer-hook-default.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 10 | reponame=$3 | 10 | reponame=$3 |
| 11 | 11 | ||
| 12 | sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile | 12 | sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile |
| 13 | sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile | 13 | sed -i -e "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile |