From ad0147af3421fad1cb150ccc90a27e2a956e5746 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 13 Mar 2015 12:51:54 +0100 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/combo-layer-hook-default.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/combo-layer-hook-default.sh') 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 -- cgit v1.2.3-54-g00ecf