summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-03-13 12:51:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:21:24 +0000
commitad0147af3421fad1cb150ccc90a27e2a956e5746 (patch)
treec2eabd5e5f68a9db46f5686c6dc61043c31c3792
parente0d3cabc5a25c611531e66b80a4d372f76e2b828 (diff)
downloadpoky-ad0147af3421fad1cb150ccc90a27e2a956e5746.tar.gz
combo-layer-hook-default.sh: avoid duplicating prefix
The existing patch might already have the desired prefix, perhaps even multiple times (due to some previous import error). Ensure that after the replace, the prefix is present exactly once. (From OE-Core rev: 03be3d350425783a5938a7e4c0b858cda634b71d) 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>
-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 8b148aca07..9dd5aedb00 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\] \($reponame: \)*\(.*\)#Subject: \[PATCH\] $reponame: \2#" $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