On Fri, Feb 23, 2024 at 5:35 AM Konstantin Aladyshev <aladyshe...@gmail.com> wrote: > > 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.
Leaving that directory is intentional, as it is used during some resuming and skipping of patching errors. These tools predate devtool and other similar things by quite a few years, so there's not much coordination between the two. It might be something that could be cleaned up, but devtool could just as easily ensure that it has a clean environment before starting and removing any failed/lingering operations .. I run into this all the time when manually working with my kernel trees, I just clean it up and move on. Also, see the README in the kern-tools repository, you are using the wrong mailing list for these questions. They should go to linux-yocto. Cheers, Bruce > > Best regards, > Konstantin Aladyshev > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#62583): https://lists.yoctoproject.org/g/yocto/message/62583 Mute This Topic: https://lists.yoctoproject.org/mt/104525948/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
