diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-08-23 19:56:28 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-23 18:32:24 -0700 |
| commit | e7aae45414e4597e9244f86a81fbc940f73785c8 (patch) | |
| tree | 7f0d676e2e9854ab410606ccf98210eaba7d52ab /scripts | |
| parent | 463d1719cc627ef22089282acfe70d7fcb835419 (diff) | |
| download | openembedded-core-e7aae45414e4597e9244f86a81fbc940f73785c8.tar.gz openembedded-core-e7aae45414e4597e9244f86a81fbc940f73785c8.tar.bz2 openembedded-core-e7aae45414e4597e9244f86a81fbc940f73785c8.tar.xz openembedded-core-e7aae45414e4597e9244f86a81fbc940f73785c8.zip | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/combo-layer-hook-default.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh index f03c4fa80..e535d5f4c 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 |