summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-08-23 19:56:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-23 18:32:38 -0700
commit9471db5ff421c0c64f582b1432d0e5f993f4b591 (patch)
tree368ca6f9bbb6cbe7d4626b5d6f2e236e7afaf932 /scripts
parent5f6dcb2bc2c5cb157e95e97a6fc7c5197a96419a (diff)
downloadpoky-9471db5ff421c0c64f582b1432d0e5f993f4b591.tar.gz
scripts/combo-layer: fix overzealous regex in default hook script
combo-layer's hook scripts are intended to modify patches as they pass through; the default one adds a prefix with the component name and a line with the component repo revision before the Signed-off-by; however the script was also unintentionally modifying the contents of patches *within* the patches passing through it, which resulted in unexpected failures when the combo-layer script attempted to use "git am" to apply them. (From OE-Core rev: e7aae45414e4597e9244f86a81fbc940f73785c8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/combo-layer-hook-default.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index f03c4fa80f..e535d5f4cc 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/scripts/combo-layer-hook-default.sh
@@ -9,5 +9,5 @@ patchfile=$1
9rev=$2 9rev=$2
10reponame=$3 10reponame=$3
11 11
12sed -i -e "s#Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile 12sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
13sed -i -e "0,/Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile 13sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile