Git repo setup for Yocto upstream contribution

Git repo setup for Yocto upstream contribution

[Yoann Congal]

Hi,

Since I plan to work regularly on upstream Yocto and contributing, I 
wonder about the best way to best setup my git repos to do that...

I've started with the upstream poky repo but when I make a commit on, 
for example, bitbake, my patch applies on a bitbake/some-path file which 
does not exist in the bitbake repo (only "some-path" exists in the 
bitbake repo).

Is this something I should address ? I found some patches for bitbake in 
the mailing list that are for "bitbake/..." paths... So, maybe, basing 
my patches on the poky repo is totally OK for now...?

To the Yocto maintainers, how do you manage this (poky repo, combo-layer 
and individual bitbake/doc/meta-yocto repo) ?

Note: I have found the "combo-layer splitpatch" tool but it does not 
look like a full solution... Maybe I'm missing something?

Thanks!
-- 
Yoann Congal ("yocton" on IRC)
Smile ECS - Tech Expert

Re: [yocto] Git repo setup for Yocto upstream contribution

[Alexander Kanavin]

I've been making patches against an integrated poky checkout for many
years, including bitbake patches. They're usually correctly picked up
and applied; you only need to ensure you route them to correct mailing
lists.

Alex

On Sat, 7 Jan 2023 at 14:05, Yoann Congal <yoann.congal@smile.fr> wrote:
>
> Hi,
>
> Since I plan to work regularly on upstream Yocto and contributing, I
> wonder about the best way to best setup my git repos to do that...
>
> I've started with the upstream poky repo but when I make a commit on,
> for example, bitbake, my patch applies on a bitbake/some-path file which
> does not exist in the bitbake repo (only "some-path" exists in the
> bitbake repo).
>
> Is this something I should address ? I found some patches for bitbake in
> the mailing list that are for "bitbake/..." paths... So, maybe, basing
> my patches on the poky repo is totally OK for now...?
>
> To the Yocto maintainers, how do you manage this (poky repo, combo-layer
> and individual bitbake/doc/meta-yocto repo) ?
>
> Note: I have found the "combo-layer splitpatch" tool but it does not
> look like a full solution... Maybe I'm missing something?
>
> Thanks!
> --
> Yoann Congal ("yocton" on IRC)
> Smile ECS - Tech Expert
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#58933): https://lists.yoctoproject.org/g/yocto/message/58933
> Mute This Topic: https://lists.yoctoproject.org/mt/96112311/1686489
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [yocto] Git repo setup for Yocto upstream contribution

[Yoann Congal]

On 1/9/23 10:29, Alexander Kanavin wrote:
> I've been making patches against an integrated poky checkout for many
> years, including bitbake patches. They're usually correctly picked up
> and applied; you only need to ensure you route them to correct mailing
> lists.

Ok, I'll keep it that way.

Thanks!

> 
> Alex
> 
> On Sat, 7 Jan 2023 at 14:05, Yoann Congal <yoann.congal@smile.fr> wrote:
>>
>> Hi,
>>
>> Since I plan to work regularly on upstream Yocto and contributing, I
>> wonder about the best way to best setup my git repos to do that...
>>
>> I've started with the upstream poky repo but when I make a commit on,
>> for example, bitbake, my patch applies on a bitbake/some-path file which
>> does not exist in the bitbake repo (only "some-path" exists in the
>> bitbake repo).
>>
>> Is this something I should address ? I found some patches for bitbake in
>> the mailing list that are for "bitbake/..." paths... So, maybe, basing
>> my patches on the poky repo is totally OK for now...?
>>
>> To the Yocto maintainers, how do you manage this (poky repo, combo-layer
>> and individual bitbake/doc/meta-yocto repo) ?
>>
>> Note: I have found the "combo-layer splitpatch" tool but it does not
>> look like a full solution... Maybe I'm missing something?
>>
>> Thanks!
>> --
>> Yoann Congal ("yocton" on IRC)
>> Smile ECS - Tech Expert

-- 
Yoann Congal
Smile ECS - Tech Expert

Re: [yocto] Git repo setup for Yocto upstream contribution

[Alexandre Belloni]

On 09/01/2023 10:29:13+0100, Alexander Kanavin wrote:
> I've been making patches against an integrated poky checkout for many
> years, including bitbake patches. They're usually correctly picked up
> and applied; you only need to ensure you route them to correct mailing
> lists.
> 

No, please send patches against the correct git tree, else you are
putting more load on the maintainers than necessary.
This was the cause of:
https://lore.kernel.org/all/Y5Sr9HSWIc5LVzl9@mail.local/

This can silently fail and then you need to wait for 7hours for the AB
to fail and this delays testing for one more day.

> Alex
> 
> On Sat, 7 Jan 2023 at 14:05, Yoann Congal <yoann.congal@smile.fr> wrote:
> >
> > Hi,
> >
> > Since I plan to work regularly on upstream Yocto and contributing, I
> > wonder about the best way to best setup my git repos to do that...
> >
> > I've started with the upstream poky repo but when I make a commit on,
> > for example, bitbake, my patch applies on a bitbake/some-path file which
> > does not exist in the bitbake repo (only "some-path" exists in the
> > bitbake repo).
> >
> > Is this something I should address ? I found some patches for bitbake in
> > the mailing list that are for "bitbake/..." paths... So, maybe, basing
> > my patches on the poky repo is totally OK for now...?
> >
> > To the Yocto maintainers, how do you manage this (poky repo, combo-layer
> > and individual bitbake/doc/meta-yocto repo) ?
> >
> > Note: I have found the "combo-layer splitpatch" tool but it does not
> > look like a full solution... Maybe I'm missing something?
> >
> > Thanks!
> > --
> > Yoann Congal ("yocton" on IRC)
> > Smile ECS - Tech Expert
> >
> > 
> >

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#58940): https://lists.yoctoproject.org/g/yocto/message/58940
> Mute This Topic: https://lists.yoctoproject.org/mt/96112311/3617179
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [yocto] Git repo setup for Yocto upstream contribution

[Alexander Kanavin]

On Mon, 9 Jan 2023 at 19:23, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
> No, please send patches against the correct git tree, else you are
> putting more load on the maintainers than necessary.
> This was the cause of:
> https://lore.kernel.org/all/Y5Sr9HSWIc5LVzl9@mail.local/
>
> This can silently fail and then you need to wait for 7hours for the AB
> to fail and this delays testing for one more day.

We never got to the bottom of what happened to that one. Part of the
patch applied correctly, the other part did not.

Alex

Re: [yocto] Git repo setup for Yocto upstream contribution

[Alexandre Belloni]

On 09/01/2023 19:30:36+0100, Alexander Kanavin wrote:
> On Mon, 9 Jan 2023 at 19:23, Alexandre Belloni
> <alexandre.belloni@bootlin.com> wrote:
> > No, please send patches against the correct git tree, else you are
> > putting more load on the maintainers than necessary.
> > This was the cause of:
> > https://lore.kernel.org/all/Y5Sr9HSWIc5LVzl9@mail.local/
> >
> > This can silently fail and then you need to wait for 7hours for the AB
> > to fail and this delays testing for one more day.
> 
> We never got to the bottom of what happened to that one. Part of the
> patch applied correctly, the other part did not.
> 

Just try to apply your patch on a bitbake repository, it will reproduce.


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [yocto] Git repo setup for Yocto upstream contribution

[Alexander Kanavin]

On Mon, 9 Jan 2023 at 20:16, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
> Just try to apply your patch on a bitbake repository, it will reproduce.

I tried. This happens only if a 3-way merge is enabled: for existing
files git will strip the leading directory as needed, but for newly
introduced files it will place them where the patch specifies.

Otherwise, the patch is fully rejected (by default) or fully correctly
accepted (with -p2).

Alex

Re: [yocto] Git repo setup for Yocto upstream contribution

[Alexandre Belloni]

On 10/01/2023 15:54:55+0100, Alexander Kanavin wrote:
> On Mon, 9 Jan 2023 at 20:16, Alexandre Belloni
> <alexandre.belloni@bootlin.com> wrote:
> > Just try to apply your patch on a bitbake repository, it will reproduce.
> 
> I tried. This happens only if a 3-way merge is enabled: for existing
> files git will strip the leading directory as needed, but for newly
> introduced files it will place them where the patch specifies.
> 
> Otherwise, the patch is fully rejected (by default) or fully correctly
> accepted (with -p2).

Either way, this is a pain for the maintainer, you should send patches
that apply cleanly.


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com