From 3941b060ff68623e6ab3d45de44ac8b40e3ca23b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 23 Aug 2011 19:56:28 +0100 Subject: [PATCH] scripts/combo-layer: fix overzealous regex in default hook script combo-layer's hook scripts are intended to modify patches as they pass through; the default one adds a prefix with the component name and a line with the component repo revision before the Signed-off-by; however the script was also unintentionally modifying the contents of patches *within* the patches passing through it, which resulted in unexpected failures when the combo-layer script attempted to use "git am" to apply them. (From OE-Core rev: e7aae45414e4597e9244f86a81fbc940f73785c8) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/combo-layer-hook-default.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh index f03c4fa..e535d5f 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 "0,/Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile +sed -i -e "s#^Subject: \[PATCH\] \(.*\)#Subject: \[PATCH\] $reponame: \1#" $patchfile +sed -i -e "0,/^Signed-off-by:/s#\(Signed-off-by:.*\)#\($reponame rev: $rev\)\n\n\1#" $patchfile -- 2.7.4