* 'kgit-s2q' doesn't remove 'rebase-apply' directory
@ 2024-02-23 10:37 Konstantin Aladyshev
0 siblings, 0 replies; 2+ messages in thread
From: Konstantin Aladyshev @ 2024-02-23 10:37 UTC (permalink / raw)
To: yocto, poky
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* 'kgit-s2q' doesn't remove 'rebase-apply' directory
@ 2024-02-23 10:35 Konstantin Aladyshev
0 siblings, 0 replies; 2+ messages in thread
From: Konstantin Aladyshev @ 2024-02-23 10:35 UTC (permalink / raw)
To: yocto, poky
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-23 10:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-23 10:37 'kgit-s2q' doesn't remove 'rebase-apply' directory Konstantin Aladyshev
-- strict thread matches above, loose matches on Subject: below --
2024-02-23 10:35 Konstantin Aladyshev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.