From: Konstantin Aladyshev <aladyshev22@gmail.com>
To: Bruce Ashfield <bruce.ashfield@gmail.com>
Cc: yocto@lists.yoctoproject.org, poky@lists.yoctoproject.org
Subject: Re: [yocto] 'kgit-s2q' doesn't remove 'rebase-apply' directory
Date: Fri, 23 Feb 2024 23:17:20 +0300 [thread overview]
Message-ID: <CACSj6VXaujPEP6Z3uDhOX_156tLN1Zdv-S2wJAzUPXdVsxhUtw@mail.gmail.com> (raw)
In-Reply-To: <CADkTA4PLga9nkB-kEHHqeWN=eEkLYEhhgqXXukv3GdwBS5Pjcw@mail.gmail.com>
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
prev parent reply other threads:[~2024-02-23 20:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CACSj6VXiG4NdETnnWcppCAxTym+kx7c3WKpj0LFGkoPKOA+Dyw@mail.gmail.com>
2024-02-23 11:28 ` [yocto] 'kgit-s2q' doesn't remove 'rebase-apply' directory Alexander Kanavin
2024-02-23 13:16 ` Bruce Ashfield
2024-02-23 20:17 ` Konstantin Aladyshev [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACSj6VXaujPEP6Z3uDhOX_156tLN1Zdv-S2wJAzUPXdVsxhUtw@mail.gmail.com \
--to=aladyshev22@gmail.com \
--cc=bruce.ashfield@gmail.com \
--cc=poky@lists.yoctoproject.org \
--cc=yocto@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).