On Sun, Dec 15, 2024 at 6:36 AM Guðni Már Gilbert via lists.openembedded.org <gudni.m.g=gmail....@lists.openembedded.org> wrote: > > Note: This patch doesn't apply cleanly to styhead due to scarthgap missing > one commit: > https://lists.openembedded.org/g/openembedded-core/topic/scarthgap_patch_1_2/110128235
This patch doesn't apply to scarthgap either: Applying: python3: upgrade 3.12.6 -> 3.12.8 Using index info to reconstruct a base tree... A meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch M meta/recipes-devtools/python/python3_3.12.6.bb Falling back to patching base and 3-way merge... Auto-merging meta/recipes-devtools/python/python3_3.12.8.bb CONFLICT (modify/delete): meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch deleted in HEAD and modified in python3: upgrade 3.12.6 -> 3.12.8. Version python3: upgrade 3.12.6 -> 3.12.8 of meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch left in tree. error: Failed to merge in the changes. Patch failed at 0001 python3: upgrade 3.12.6 -> 3.12.8 Also, I will need to have this version bump in styhead before I can take it for scarthgap. So please send a patch for styhead too. Steve > I submitted two backport patches with the missing commits from styhead to > scarthgap to sync the branches. Should make things easier to upgrade both > branches at the same time. > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#208773): https://lists.openembedded.org/g/openembedded-core/message/208773 Mute This Topic: https://lists.openembedded.org/mt/110127757/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
