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:03:10 +0000 |
| commit | 2737bd1c3f7c51dd6509a0f91337f695f9c69165 (patch) | |
| tree | 0273f943e34c77628cebea4fc3a767fdd6b31c85 /scripts | |
| parent | 03be3d350425783a5938a7e4c0b858cda634b71d (diff) | |
| download | openembedded-core-contrib-2737bd1c3f7c51dd6509a0f91337f695f9c69165.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.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -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 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 |