]> code.ossystems Code Review - openembedded-core.git/commit
devtool upgrade: rebase override-only patches as well
authorAlexander Kanavin <alex.kanavin@gmail.com>
Tue, 22 Jun 2021 11:21:08 +0000 (13:21 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 26 Jun 2021 10:22:46 +0000 (11:22 +0100)
commit588d04748dd89b5371ca9144666e97ec82dd6204
tree55829b820e4c42425b1351892dac0caa113252a5
parent8bc339b83a45becc0c7edf016fcce187152669e3
devtool upgrade: rebase override-only patches as well

There's a number of recipes (such as nettle or glib) which were upgraded
incorrectly due to rebasing only the default set of patches in main SRC_URI.
Native-only or musl-only patches were not handled, causing do_patch fails
and overall misery.

Unfortunately, this also necessitates aborting any incomplete rebases as
devtool needs to be able to return to the original branch to complete
the upgrade command.

Also, do not add devtool-patched-%version tags, as they are not used anywhere,
and it's unclear how to extend them to cover multiple override branches.

(From OE-Core rev: 00131cbc969f6a73caffe068fcb983287cbe577f)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
scripts/lib/devtool/upgrade.py