summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-03-13 12:57:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:21:25 +0000
commitb4e78cf6df8a2f42979e22a4dd95ecd53b78c906 (patch)
tree06c0847a31d83ed10e42a3674e20de74080047e5 /scripts
parentad0147af3421fad1cb150ccc90a27e2a956e5746 (diff)
downloadast2050-yocto-poky-b4e78cf6df8a2f42979e22a4dd95ecd53b78c906.zip
ast2050-yocto-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')
-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 9dd5aed..46f2b70 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/scripts/combo-layer-hook-default.sh
@@ -9,5 +9,5 @@ patchfile=$1
rev=$2
reponame=$3
-sed -i -e "s#^Subject: \[PATCH\] \($reponame: \)*\(.*\)#Subject: \[PATCH\] $reponame: \2#" $patchfile
+sed -i -e "0,/^Subject:/s#^Subject: \[PATCH\] \($reponame: \)*\(.*\)#Subject: \[PATCH\] $reponame: \2#" $patchfile
sed -i -e "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile
OpenPOWER on IntegriCloud