summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-03-13 13:04:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:03:10 +0000
commit58548081b15f37452b71c135d5aa8cbbda5b1b61 (patch)
tree94b6986deaa9a14fda45ed905b5e9d4792e612e0 /scripts
parent2737bd1c3f7c51dd6509a0f91337f695f9c69165 (diff)
downloadopenembedded-core-58548081b15f37452b71c135d5aa8cbbda5b1b61.tar.gz
openembedded-core-58548081b15f37452b71c135d5aa8cbbda5b1b61.tar.bz2
openembedded-core-58548081b15f37452b71c135d5aa8cbbda5b1b61.zip
combo-layer-hook-default.sh: handle patches without Signed-off-by
Inserting the "From rev" comment depended on having at least one Signed-off-by line in the patch header. Some old repository commits in openembedded-core and bitbake do not have those. When inporting those, just insert at the end of the patch header. While doing so, ensure that there's exactly one blank line since the last non-blank line. 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.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/combo-layer-hook-default.sh b/scripts/combo-layer-hook-default.sh
index 46f2b70fc4..1e3a3b9bc8 100755
--- a/scripts/combo-layer-hook-default.sh
+++ b/scripts/combo-layer-hook-default.sh
@@ -10,4 +10,11 @@ rev=$2
reponame=$3
sed -i -e "0,/^Subject:/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
+if grep -q '^Signed-off-by:' $patchfile; then
+ # Insert before Signed-off-by.
+ sed -i -e "0,/^Signed-off-by:/s#\(^Signed-off-by:.*\)#\(From $reponame rev: $rev\)\n\n\1#" $patchfile
+else
+ # Insert before final --- separator, with extra blank lines removed.
+ perl -e "\$_ = join('', <>); s/^(.*\S[ \t]*)(\n|\n\s*\n)---\n/\$1\n\nFrom $reponame rev: $rev\n---\n/s; print;" $patchfile >$patchfile.tmp
+ mv $patchfile.tmp $patchfile
+fi