Skip to contentSkip to conversation

5.10.200-cip40-rt17 (rt97) update -- not easy

DISCUSSION Pavel Machek 2 participants 2 messages Nov 20, 2023 – Nov 21, 2023

lore
Share & tools
lore
#0 lore raw

Hi!

I tried to prepare 5.10.200-cip40-rt17 (rt97) update, but I don't know how to verify it. Problem is that regular release and rt releases are based on different -stable release, thus can't be compared easily.

I have 5.10.200-cip40 and v5.10.199-rt97. In -cip branch, I have to combine them, and result will be 5.10.200-cip40 (rt97). But we have -cip-rebase which is "on top" of rt. And rt is on 5.10.199, so I get 5.10.199-cip40 (rt97), which is obviously different trees.

Best regards,
Pavel

Signature · 2 lines
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#1 lore raw
Quoted 5 lines · Pavel Machek

Hi!

I tried to prepare 5.10.200-cip40-rt17 (rt97) update, but I don't know how to verify it. Problem is that regular release and rt releases are based on different -stable release, thus can't be compared easily.

Are you normally merging in the -rt tree?

Quoted 6 lines

I have 5.10.200-cip40 and v5.10.199-rt97. In -cip branch, I have to combine them, and result will be 5.10.200-cip40 (rt97). But we have -cip-rebase which is "on top" of rt. And rt is on 5.10.199, so I get 5.10.199-cip40 (rt97), which is obviously different trees.

How about creating a temporary tree that merges 5.10.200-cip40 into v5.10.199-rt97? That should give no major conflicts (knock-on-wood), and you could compare the desired update route against that.

Jan

Signature · 2 lines
Siemens AG, Technology
Linux Expert Center