Hi Aleksandar, Aleksandar Nikolic via lists.yoctoproject.org <aleksandar.nikolic010= gmail....@lists.yoctoproject.org> escreveu (sexta, 20/09/2024 à(s) 08:11):
> Hi, > > As the title says, I would like to understand how changes get merged from > master to release branches? Is it done automatically or manually? Can I > read somewhere about this process? > > An example: a few of my commits are at the moment only on the master > branch. Some are fixes, which need to go to other branches as-is, while in > some other commits the changes contain the version (e.g. 5.0.2), meaning > those commits are not valid for branches other than scarthgap (e.g. > kirkstone). For the former - am I supposed to cherry-pick these "fix" > commits myself and provide a patch? For the latter - am I supposed to > provide fresh patches, which reflect the branch in question (e.g. instead > of having 5.0.2, the patch for kirkstone should have something like 4.0.21)? > OE-core have dedicated maintainers for specific branches/versions [1]. The maintainer of the older and LTS branches constantly backport bug fixes from the master branch. But any user can help with this enfort sending patches as well: git cherry-pick -s -x ... git send-email --to=openembedded-c...@lists.openembedded.org --subject-prefix="[OE-core][BRANCH_NAME][PATCH]" -1 Where BRANCH_NAME should be replaced by the target branch: Styhead/Scarthgap/Kirkstone There is still a good contribution guide [2] on the Yocto documentation that can also help. [1] https://wiki.yoctoproject.org/wiki/Releases [2] https://docs.yoctoproject.org/contributor-guide/index.html Jose > > Aleksandar > > > > -- Best regards, José Quaresma
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#63873): https://lists.yoctoproject.org/g/yocto/message/63873 Mute This Topic: https://lists.yoctoproject.org/mt/108554660/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
