]> 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)
committerAnuj Mittal <anuj.mittal@intel.com>
Wed, 30 Jun 2021 06:00:11 +0000 (14:00 +0800)
commita4a5bebcc06637e097f074be9e401aafa8685c38
treee4083b725605bab6378fc2557714a6c390b58bdd
parent0fc4e10250e69a67c5250ce48bfc632d90a34097
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>
(cherry picked from commit 588d04748dd89b5371ca9144666e97ec82dd6204)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
scripts/lib/devtool/upgrade.py