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. (From OE-Core rev: 58548081b15f37452b71c135d5aa8cbbda5b1b61) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b4e78cf6df
commit
be6289f4af
|
@ -10,4 +10,11 @@ rev=$2
|
||||||
reponame=$3
|
reponame=$3
|
||||||
|
|
||||||
sed -i -e "0,/^Subject:/s#^Subject: \[PATCH\] \($reponame: \)*\(.*\)#Subject: \[PATCH\] $reponame: \2#" $patchfile
|
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
|
||||||
|
|
Loading…
Reference in New Issue