Difference between revisions of "How to submit a patch to OpenEmbedded"
(Add section on git configuration)
(→Streamlining git-send-email with configuration)
|Line 108:||Line 108:|
=== Streamlining git-send-email with configuration ===
=== Streamlining git-send-email with configuration ===
Don't want to have to remember to specify the right options when using git-send-email (or the pull request script)? You can actually set these in
Don't want to have to remember to specify the right options when using git-send-email (or the pull request script)? You can actually set these in gitconfiguration and save yourself a lot of hassle.
Revision as of 13:24, 21 May 2014
OpenEmbedded welcomes contributions. Before submitting a patch however there are a few things to keep in mind.
- 1 Finding the right place for your patch
- 2 A task-oriented guide to creating a patch
- 3 Community review
- 4 Appendix
Finding the right place for your patch
OpenEmbedded is now split up into separate layers: OpenEmbedded-Core (OE-Core) which is a small set of core recipes, and other layers for recipes beyond that. For most layers, patches are sent to a mailing list for review before being merged. Further information specific to the layer you're working on please see the README file in the layer.
New recipes in particular should be added to the appropriate layer. See the layer index for the list of public layers. If your new recipe doesn't seem to fit anywhere it can be added to the meta-oe layer in the meta-openembedded repository, although if it is likely to be followed by numbers of similar recipes then you may wish to consider creating a new layer.
A task-oriented guide to creating a patch
Let's say you have made a fix to a recipe, you've tested that it works and you'd like to submit it for merging.
Set up git
Properly configuring git (using firstname.lastname@example.org as an example user)
On Debian / Ubuntu (Note: Fedora uses `yum` OpenSuse uses zypper or yast)
sudo aptitude install git-core git-email
These are important to the commit meta-data
git config --global user.name "Tekkub" git config --global user.email "email@example.com"
Any Google Apps account
git config --global sendemail.smtpserver smtp.gmail.com git config --global sendemail.smtpserverport 587 git config --global sendemail.smtpencryption tls git config --global sendemail.smtpuser firstname.lastname@example.org
You can use the --envelope-sender option to have the email appear from the address you are subscribed to the list with. You will need to use the Accounts and import tab under the gmail settings tab. Use the Send mail as selection to address you want to send email from.
Subscribe to the mailing list
You need to subscribe to the appropriate mailing-list in order to be able to send your patch(es) there; for patches against OE-Core the mailing list is email@example.com and for patches against meta-oe and many other layers the list is firstname.lastname@example.org. See Mailing lists for subscription and further details.
Committing your patch
Commit with a concise and descriptive message - one that explains your changes in a way others get a short overview without looking at the code.
cd oe-core/ # or whereever you keep your clone of the repo git add meta/recipes-devtools/flex git commit -s # don't use the -m option but include my signature
flex: backport Debian patches to fix generated code warnings The generated parser had warnings regarding signess and return check which makes Linux Kernel's perf tool from 3.4 release to fail without those patches.
All commit messages must include Signed-off-by (-s option to commit as above). For more guidelines on messages please see Commit Patch Message Guidelines.
Note that when adding multiple new recipes, each recipe should be added in a separate commit. For upgrades of existing recipes, the previous version should usually be deleted as part of the same commit to add the upgraded version.
There are two possible methods for submitting patches. Either one is acceptable; for a series containing a number of patches the pull request method is preferred although not mandatory.
Sending using git-send-email
To send just the top commit on your current branch (substitute mailing list address as appropriate):
git send-email --email@example.com --confirm=always -M -1
For multiple commits you can substitute -1 above with -N (where N is the number of commits) or instead specify a revision before which to start e.g. HEAD~3, master etc.
Note: in either case if you are submitting a patch for meta-oe or any layer other than OE-Core, please add the appopriate prefix so that it is clear which layer the patch is intended to be applied to:
Please substitute "PATCH" with "PATCH v2" if you are submitting a revised version after addressing feedback (or v3, v4 etc.)
Sending via a pull request
Alternatively, for larger patch series it is preferable to send a pull request which not only includes the patch but also a pointer to a branch that can be pulled from. This involves making a local branch for your changes, pushing this branch to an accessible repository and then using the
send-pull-request scripts (supplied with OE-Core) to create and send a patch series with a link to the branch for review. Step-by-step instructions:
- Find a repository to push your changes to, and add this as a remote to your git working tree. If you're going to be submitting a lot of changes, some of the repositories have a corresponding
-contribrepository which you can use for this purpose - access to these for OE-related work is open to anyone who requests it. Otherwise github or some other public git hosting service can suffice.
- Create a branch for your changes if you haven't already. Other than backports from master or fixing bugs that only occur in an older branch, this should be on top of the master branch.
- Push the branch to the remote.
scripts/create-pull-request -u remote-name(where
remote-nameis the name of the remote where you'll be pushing the branch). For meta-oe and other layers where a single mailing list covers more than one layer you'll need to add
-p "layername][PATCH"replacing layername with the name of the layer so that it is clear which layer the patches are intended for.
- The script will report that it has created a
pull-XXXXXdirectory has been created. Edit the
pull-XXXXX/0000-cover-letter.patchwith your favourite text editor and change the title and top of the body as appropriate.
scripts/send-pull-request -p pull-XXXXX -t firstname.lastname@example.org(replacing email@example.com with the appropriate mailing list address for layers other than OE-Core). Where there is a clear maintainer for the area you're changing it may also help to add
Your patch will be sent to the mailing list and for some layers should be immediately visible on http://patches.openembedded.org/
If you get feedback in reply to your patch, you should make changes according to the feedback and submit the next version. Please remember to use
--subject-prefix="PATCH v2", v3, v4 etc. to mark the patch iteration.
If your patch has not had any feedback after a few days it may have been missed or the appropriate reviewers may not currently be around; it is perfectly fine to reply to it yourself with a "ping" / reminder request for feedback.
Steps for people which don't have SMTP access for git
Patches should not be sent as attachment but inline.
If you do not have SMTP access to your email account you have two options:
1. Use a different account (e.g. gmail). you can make one especially for this. Note that the account may differ from the one in signed-off (although that is inconvenient)
2. Just include the patch in the body of your email. Make sure you use an email client that does not touch the message (turn spaces in tabs, wrap lines etc etc).
A good mail client to do so is pine (or alpine) or mutt. For more information refer to Documentation/email-clients.txt in linux kernel sources.
Streamlining git-send-email with configuration
Don't want to have to remember to specify the right options when using git-send-email (or the pull request script)? You can actually set these in git's configuration and save yourself a lot of hassle.
- Always confirm sending (for all repositories):
git config --global sendemail.confirm always
- Set send-to email address for the repository (don't forget to specify the right address!):
git config --local sendemail.to firstname.lastname@example.org
- If the mailing list requires a subject prefix for the layer (only works when the repository only contains one layer; set layer name as appropriate):
git config --local format.subjectprefix "meta-something][PATCH"