aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
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:03:10 +0000
commit03be3d350425783a5938a7e4c0b858cda634b71d (patch)
tree568cb647f0cad7dacb4d6b99de0907f77f0e5d49 /scripts
parent74f4c9e3bcdb3c4ca919623086e92a9379bd81ff (diff)
downloadopenembedded-core-contrib-03be3d350425783a5938a7e4c0b858cda634b71d.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. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
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 8b148aca07..9dd5aedb00 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\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile
+sed -i -e "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