From: Konstantin Aladyshev <aladyshev22@gmail.com>
To: yocto@lists.yoctoproject.org, poky@lists.yoctoproject.org
Subject: 'kgit-s2q' doesn't remove 'rebase-apply' directory
Date: Fri, 23 Feb 2024 13:37:42 +0300 [thread overview]
Message-ID: <CACSj6VXH88d=oAw6KsancYXiW1B=oLgXD3uSxnentWJd4Dbi7Q@mail.gmail.com> (raw)
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
reply other threads:[~2024-02-23 10:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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='CACSj6VXH88d=oAw6KsancYXiW1B=oLgXD3uSxnentWJd4Dbi7Q@mail.gmail.com' \
--to=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).