'kgit-s2q' doesn't remove 'rebase-apply' directory

'kgit-s2q' doesn't remove 'rebase-apply' directory

[Konstantin Aladyshev]

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.

Best regards,
Konstantin Aladyshev

Re: [yocto] 'kgit-s2q' doesn't remove 'rebase-apply' directory

[Alexander Kanavin]

If you want help or fixes, you need to show how to reproduce the issue
with plain poky master via specific steps, and not just discuss
problems in your local setup.

Alex

On Fri, 23 Feb 2024 at 11:35, Konstantin Aladyshev
<aladyshev22@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.
>
> Best regards,
> Konstantin Aladyshev
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#62574): https://lists.yoctoproject.org/g/yocto/message/62574
> Mute This Topic: https://lists.yoctoproject.org/mt/104525948/1686489
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [yocto] 'kgit-s2q' doesn't remove 'rebase-apply' directory

[Bruce Ashfield]

On Fri, Feb 23, 2024 at 5:35 AM Konstantin Aladyshev
<aladyshev22@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
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#62574): https://lists.yoctoproject.org/g/yocto/message/62574
> Mute This Topic: https://lists.yoctoproject.org/mt/104525948/1050810
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [yocto] 'kgit-s2q' doesn't remove 'rebase-apply' directory

[Konstantin Aladyshev]

Thanks Bruce!
So what do you suggest, that devtool needs to remove the
".git/rebase-apply" directory in its "devtool_post_patch" task?
Anyway, I'm moving the discussion to "linux-yocto" with some
additional info on how to recreate the error on poky master.

Best regards,
Konstantin

On Fri, Feb 23, 2024 at 4:16 PM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Fri, Feb 23, 2024 at 5:35 AM Konstantin Aladyshev
> <aladyshev22@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
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#62574): https://lists.yoctoproject.org/g/yocto/message/62574
> > Mute This Topic: https://lists.yoctoproject.org/mt/104525948/1050810
> > Group Owner: yocto+owner@lists.yoctoproject.org
> > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [bruce.ashfield@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II

'kgit-s2q' doesn't remove 'rebase-apply' directory

[Konstantin Aladyshev]

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.

Best regards,
Konstantin Aladyshev