From: Alexander Kanavin <alex.kanavin@gmail.com>
To: yocto@lists.yoctoproject.org, aladyshev22@gmail.com
Cc: poky@lists.yoctoproject.org
Subject: Re: [yocto] 'kgit-s2q' doesn't remove 'rebase-apply' directory
Date: Fri, 23 Feb 2024 12:28:28 +0100 [thread overview]
Message-ID: <CANNYZj8PNVCuDPGC8ZhhunY9berfSsejcj9mv0=dECOeYx4LFA@mail.gmail.com> (raw)
In-Reply-To: <CACSj6VXiG4NdETnnWcppCAxTym+kx7c3WKpj0LFGkoPKOA+Dyw@mail.gmail.com>
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]
> -=-=-=-=-=-=-=-=-=-=-=-
>
next parent reply other threads:[~2024-02-23 11:28 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 ` Alexander Kanavin [this message]
2024-02-23 13:16 ` [yocto] 'kgit-s2q' doesn't remove 'rebase-apply' directory Bruce Ashfield
2024-02-23 20:17 ` Konstantin Aladyshev
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='CANNYZj8PNVCuDPGC8ZhhunY9berfSsejcj9mv0=dECOeYx4LFA@mail.gmail.com' \
--to=alex.kanavin@gmail.com \
--cc=aladyshev22@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).