diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2015-03-13 12:57:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 11:21:25 +0000 |
commit | b4e78cf6df8a2f42979e22a4dd95ecd53b78c906 (patch) | |
tree | 06c0847a31d83ed10e42a3674e20de74080047e5 /scripts/combo-layer-hook-default.sh | |
parent | ad0147af3421fad1cb150ccc90a27e2a956e5746 (diff) | |
download | poky-b4e78cf6df8a2f42979e22a4dd95ecd53b78c906.tar.gz |
combo-layer-hook-default.sh: beware of embedded patches
Patching the subject line must be limited to the subject of
the main patch itself. In particular, git formatted patches embedded in the patch must not be changed.
Achieved by limiting the replacement to the lines until the first
subject in the patch, just as it is done for modifying the first
Signed-off-by.
(From OE-Core rev: 2737bd1c3f7c51dd6509a0f91337f695f9c69165)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer-hook-default.sh')
-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 9dd5aedb00..46f2b70fc4 100755 --- a/scripts/combo-layer-hook-default.sh +++ b/scripts/combo-layer-hook-default.sh | |||
@@ -9,5 +9,5 @@ patchfile=$1 | |||
9 | rev=$2 | 9 | rev=$2 |
10 | reponame=$3 | 10 | reponame=$3 |
11 | 11 | ||
12 | sed -i -e "s#^Subject: \[PATCH\] \($reponame: \)*\(.*\)#Subject: \[PATCH\] $reponame: \2#" $patchfile | 12 | sed -i -e "0,/^Subject:/s#^Subject: \[PATCH\] \($reponame: \)*\(.*\)#Subject: \[PATCH\] $reponame: \2#" $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 |