Hello!
'kgit-s2q' in the linux recipe tries to use 'git apply' if 'git am' fails.
In this case 'kgit-s2q' manually creates a ".git/rebase-apply"
directory
(https://git.yoctoproject.org/yocto-kernel-tools/tree/tools/kgit-s2q#n622)
But it looks like this directory is not removed after the patches are
applied. This creates a problem, since with this directory present git
thinks that rebase operation is still in progress.
Because of this bug 'devtool modify linux' can't perform its own
rebase operations in the "devtool_post_patch" tasks
https://git.yoctoproject.org/poky/tree/meta/classes/devtool-source.bbclass#n214
In the end this creates a situation when the local patches are not applied.
Tested:
The issue can be recreated with the poky master.
Create a "linux-yocto_%.bbappend" file with a patch that can't be
applied with "git am" - this will make kgit-s2q use "git apply" and
therefore create a ".git/rebase-apply" directory.
In this case "devtool modify linux-yocto" fails with error:
```
ERROR: ExecutionError('git rebase devtool-no-overrides', 128, '',
'fatal: It seems that there is already a rebase-apply directory,
and\nI wonder if you are in the middle of another rebase. If that is
the\ncase, please try\n\tgit rebase (--continue | --abort |
--skip)\nIf that is not the case, please\n\trm -fr
".git/rebase-apply"\nand run me again. I am stopping in case you
still have something\nvaluable there.\n\n')
```
Best regards,
Konstantin Aladyshev
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13601):
https://lists.yoctoproject.org/g/linux-yocto/message/13601
Mute This Topic: https://lists.yoctoproject.org/mt/104535903/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
