Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revisionBoth sides next revision
submitting-patches [2023/12/11 21:15] – [Deciding where to send the patch] Links to specific repo's contribution guidelines efahlgrensubmitting-patches [2024/06/17 08:59] – old revision restored (2024/01/03 07:44) svanheule
Line 70: Line 70:
   - PRs can be sent to the patches mailing list from any source and will always be considered for inclusion if the quality of the tree is good and format of submission is correct   - PRs can be sent to the patches mailing list from any source and will always be considered for inclusion if the quality of the tree is good and format of submission is correct
   - Staging trees can be hosted as part of the projects git infrastructure, private servers, GitHub ...   - Staging trees can be hosted as part of the projects git infrastructure, private servers, GitHub ...
 +===== Patch backports ===== 
 +Backporting refers to applying changes to a stable (release) branch like for example **openwrt-23.05** from the **main** branch. Since new features are not added to stable branches, backported changes are generally bug fixes and security fixes only. The process is roughly following: 
 +  - Changes needs to be first applied into the **main** branch 
 +  - Afterwards those changes can be proposed to be applied into the stable (release) branch 
 +When pulling the commits from the **main** branch, you need to use ''git cherry-pick'' command with the ''-x'' argument and thus append a line that says ''(cherry picked from commit <commit>)'' to the original commit message ([[https://github.com/openwrt/openwrt/commit/59fd8f08cf544a7f0fcaf700ca9af9292de3adcc.patch|example]]) in order to indicate which commit this change was cherry-picked from. This is needed for traceability. It is also required that you add the ''--signoff'' to the commits, if you did not create the original commits. 
 +<code bash> 
 +$ git cherry-pick --signoff -x <commit> 
 +</code>
 ===== Patch checklist ===== ===== Patch checklist =====
   - Single commit ( multiple commits must first be squashed, as described [[docs:guide-developer:working-with-github-pr#squashing_commits|here]]  )   - Single commit ( multiple commits must first be squashed, as described [[docs:guide-developer:working-with-github-pr#squashing_commits|here]]  )
  • Last modified: 2024/12/06 16:55
  • by wertwert4pda