What are the plans for the nanbield branch?

What are the plans for the nanbield branch?

[Peter Kjellerstedt]

Khem and Armin,

what are the plans for the nanbield branch, given that is was 
branched off long before the actual Nanbield release? Do you plan 
on merging master into it once Nanbield is released, or will it 
stay as it is and relevant parts will have to be backported? 

The reason I ask is because I am currently working on preparing 
our layers for the upgrade to Nanbield and currently there is 
quite a big difference between the nanbield branch and the master 
branch in meta-openembedded. Thus it would help to know if should 
continue to track the master branch for meta-openembedded, or if 
I should revert to the nanbield branch.

//Peter

Re: [oe] What are the plans for the nanbield branch?

[akuster808]

On 10/5/23 7:01 AM, Peter Kjellerstedt wrote:
> Khem and Armin,
>
> what are the plans for the nanbield branch, given that is was
> branched off long before the actual Nanbield release? Do you plan
> on merging master into it once Nanbield is released, or will it
> stay as it is and relevant parts will have to be backported?

I started a stable/nanbield-nut with a sync to the tip of master. That 
will most likely be the starting point depending on when 4.3 is 
released. I might sync once more.

>
> The reason I ask is because I am currently working on preparing
> our layers for the upgrade to Nanbield and currently there is
> quite a big difference between the nanbield branch and the master
> branch in meta-openembedded. Thus it would help to know if should
> continue to track the master branch for meta-openembedded, or if
> I should revert to the nanbield branch.

Typically if there are no new applications added after a new stable 
branch is released, the first few merges tend to be in line with master.

hope this helps,
Armin

>
> //Peter
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105357): https://lists.openembedded.org/g/openembedded-devel/message/105357
> Mute This Topic: https://lists.openembedded.org/mt/101777064/3616698
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe] What are the plans for the nanbield branch?

[Khem Raj]

Hi Peter,

We have created the branch since there were some patches moving
python3 recipes to core which were not sure if they will make into
this release
or not. Plan was to keep it in sync with master as far as possible.
Good part is that those python recipe move has made into core in
nanbield so we
are unblocked. Armin
has plans to sync nanbield to master

Thanks
-Khem

On Thu, Oct 5, 2023 at 7:03 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> Khem and Armin,
>
> what are the plans for the nanbield branch, given that is was
> branched off long before the actual Nanbield release? Do you plan
> on merging master into it once Nanbield is released, or will it
> stay as it is and relevant parts will have to be backported?
>
> The reason I ask is because I am currently working on preparing
> our layers for the upgrade to Nanbield and currently there is
> quite a big difference between the nanbield branch and the master
> branch in meta-openembedded. Thus it would help to know if should
> continue to track the master branch for meta-openembedded, or if
> I should revert to the nanbield branch.
>
> //Peter
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105357): https://lists.openembedded.org/g/openembedded-devel/message/105357
> Mute This Topic: https://lists.openembedded.org/mt/101777064/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe] What are the plans for the nanbield branch?

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2156 bytes --]

FWIW: I prefer oe-core keeping master and nanbield in sync (even using the
same SHAs) until they really need to be different

Now there is the Maintainer change in READMEs already applied in nanbield,
so the commits from master won't be idential SHAs. Next time it would be
IMHO better to delay merging README update until the branches need to
diverge.

Regards,

On Thu, Oct 5, 2023 at 7:01 PM Khem Raj <raj.khem@gmail.com> wrote:

> Hi Peter,
>
> We have created the branch since there were some patches moving
> python3 recipes to core which were not sure if they will make into
> this release
> or not. Plan was to keep it in sync with master as far as possible.
> Good part is that those python recipe move has made into core in
> nanbield so we
> are unblocked. Armin
> has plans to sync nanbield to master
>
> Thanks
> -Khem
>
> On Thu, Oct 5, 2023 at 7:03 AM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > Khem and Armin,
> >
> > what are the plans for the nanbield branch, given that is was
> > branched off long before the actual Nanbield release? Do you plan
> > on merging master into it once Nanbield is released, or will it
> > stay as it is and relevant parts will have to be backported?
> >
> > The reason I ask is because I am currently working on preparing
> > our layers for the upgrade to Nanbield and currently there is
> > quite a big difference between the nanbield branch and the master
> > branch in meta-openembedded. Thus it would help to know if should
> > continue to track the master branch for meta-openembedded, or if
> > I should revert to the nanbield branch.
> >
> > //Peter
> >
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105359):
> https://lists.openembedded.org/g/openembedded-devel/message/105359
> Mute This Topic: https://lists.openembedded.org/mt/101777064/3617156
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> martin.jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 3156 bytes --]

Re: [oe] What are the plans for the nanbield branch?

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2374 bytes --]

On Thu, Oct 5, 2023 at 10:13 AM Martin Jansa <martin.jansa@gmail.com> wrote:

> FWIW: I prefer oe-core keeping master and nanbield in sync (even using the
> same SHAs) until they really need to be different
>
> Now there is the Maintainer change in READMEs already applied in nanbield,
> so the commits from master won't be idential SHAs. Next time it would be
> IMHO better to delay merging README update until the branches need to
> diverge.
>

As I explained it was at a divergence point when it was created

Regards,
>
> On Thu, Oct 5, 2023 at 7:01 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>> Hi Peter,
>>
>> We have created the branch since there were some patches moving
>> python3 recipes to core which were not sure if they will make into
>> this release
>> or not. Plan was to keep it in sync with master as far as possible.
>> Good part is that those python recipe move has made into core in
>> nanbield so we
>> are unblocked. Armin
>> has plans to sync nanbield to master
>>
>> Thanks
>> -Khem
>>
>> On Thu, Oct 5, 2023 at 7:03 AM Peter Kjellerstedt
>> <peter.kjellerstedt@axis.com> wrote:
>> >
>> > Khem and Armin,
>> >
>> > what are the plans for the nanbield branch, given that is was
>> > branched off long before the actual Nanbield release? Do you plan
>> > on merging master into it once Nanbield is released, or will it
>> > stay as it is and relevant parts will have to be backported?
>> >
>> > The reason I ask is because I am currently working on preparing
>> > our layers for the upgrade to Nanbield and currently there is
>> > quite a big difference between the nanbield branch and the master
>> > branch in meta-openembedded. Thus it would help to know if should
>> > continue to track the master branch for meta-openembedded, or if
>> > I should revert to the nanbield branch.
>> >
>> > //Peter
>> >
>> >
>> >
>> >
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>>
> View/Reply Online (#105359):
>> https://lists.openembedded.org/g/openembedded-devel/message/105359
>> Mute This Topic: https://lists.openembedded.org/mt/101777064/3617156
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
>> martin.jansa@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>>

[-- Attachment #2: Type: text/html, Size: 4194 bytes --]