summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-19 15:07:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-21 13:27:35 +0100
commit9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb (patch)
tree49747152286bc8073b27e06b4ca937a9af91bc73 /scripts
parent81274f4488fbc4d68d150870735ec0181b60b451 (diff)
downloadopenembedded-core-9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb.tar.gz
openembedded-core-9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb.tar.bz2
openembedded-core-9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb.tar.xz
openembedded-core-9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb.zip
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 <paul.eggleton@linux.intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/combo-layer-hook-default.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index e535d5f4c..8b148aca0 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