Re: [PATCH xenomai-images] linux-xenomai: use the wip/evl-riscv branch for riscv

On 7/9/26 08:31, Jan Kiszka wrote:
> On 09.07.26 07:03, Tobias Schaffner wrote:
>> On 7/8/26 23:26, Jan Kiszka wrote:
>>> On 08.07.26 21:40, Tobias Schaffner wrote:
>>>> The wip/flo/v7.1-evl-rebase+riscv branch was a temporary branch
>>>> for integration of the riscv patches into 7.1.
>>>>
>>>> Switch back to wip/evl-riscv which should generally hold the
>>>> current riscv patch set ontop of the latest next.
>>>>
>>>> Signed-off-by: Tobias Schaffner <[email protected]>
>>>> ---
>>>>    recipes-kernel/linux/linux-xenomai-4_latest.bb | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/recipes-kernel/linux/linux-xenomai-4_latest.bb b/
>>>> recipes-kernel/linux/linux-xenomai-4_latest.bb
>>>> index 48499ca..a542e80 100644
>>>> --- a/recipes-kernel/linux/linux-xenomai-4_latest.bb
>>>> +++ b/recipes-kernel/linux/linux-xenomai-4_latest.bb
>>>> @@ -34,7 +34,7 @@ GIT_BRANCH = "${@ \
>>>>        'v6.12.y-cip-evl-rebase' if is_kernel(d, '6.12') \
>>>>        else 'v6.18.y-evl-rebase' if is_kernel(d, '6.18') \
>>>>        else d.getVar('LATEST_KERNEL_BRANCH') }"
>>>> -GIT_BRANCH:riscv64 = "wip/flo/v7.1-evl-rebase+riscv"
>>>> +GIT_BRANCH:riscv64 = "wip/evl-riscv"
>>>>    
>>>
>>> This branch became stale, that's why I switched (535ce20bf0e8). You just
>>> updated it to 7.1, but its baseline is again outdated.
>>
>> Florian updates the Dovetail branches and after that these changes have
>> to be rebased into the evl branches and I again have to rebase or
>> cherry-pick my dovetail and evl patches on top of that.
>>
>> What is your expectation here? There are three different parts and at
>> least two people involved and I do not have something like a automatic
>> pipeline.
>>
>> I am still trying my best to keep the dovetail, evl and libevl branches
>> up to date.
>>
> 
> Also because of this split between to persons, I was switching to his
> branch, assuming that, when he updates the baseline, he will also rebase
> riscv.
> 
> But this issue should be resolved now within the next 2 or 3 weeks by
> finally having riscv as part of the latest evl-rebase branch.
> So I'm unsure if it is worth switching branches once more or rather wait
> until we can simply drop that line above.

Fine by me as long as I do not have to change any additional technical 
stuff until then and riscv makes it into v7.1.

Care that the riscv patches included in the 
wip/flo/v7.1-evl-rebase+riscv branch are already superseded by v11. As 
this revision only contains cosmetic changes this is fine.

We are choosing between the latest riscv patchset and the latest state 
of dovetail integration here as both developments happen in parallel.

Best,
Tobias

> Jan
>