]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
lib/oe/patch: improve accuracy of patch header extraction
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Fri, 23 Sep 2016 09:22:11 +0000 (21:22 +1200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 24 Sep 2016 06:30:09 +0000 (07:30 +0100)
commit7caf628e83c32723c8c1598b88e71df45b651221
tree03a7fa5bc3fcb735b43d6a407964e8baaa2fe610
parentf6928407ed281fe5c4219cd6c9f50b664fccb360
lib/oe/patch: improve accuracy of patch header extraction

When PATCHTOOL = "git", if we need to manually apply a patch and then
commit it (i.e. when git am doesn't work) we try to extract the author /
date / shortlog from the patch header. Make the following improvements
to that extraction process:

* If there's no explicit Subject: but the first line is followed by a
  blank line, isn't an Upstream-Status: or Index: marker and isn't too
  long, then assume it's good enough to be the shortlog. This avoids
  having too many patches with "Upgrade to version x.y" as the shortlog
  (since that is often when patches get added).
* Add --follow to the command we use to find the commit that added the
  patch, so we mostly get the commit that added the patch rather than
  getting stuck on upgrade commits that last moved/renamed the patch
* Populate the date from the commit that added the patch if we were able
  to get the author but not the date from the patch (otherwise you get
  today's date which is less useful).

(From OE-Core rev: 896cfb10ec166a677cbb3b4f8643719cabeb7663)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/patch.py