User Tools

Site Tools


volunteerpkgsrc

Differences

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

Link to this comparison view

Next revision
Previous revision
volunteerpkgsrc [2014/11/11 14:52]
127.0.0.1 external edit
volunteerpkgsrc [2016/03/30 20:10]
bleakgadfly [Maintaining Branches] Made list numbers bold
Line 7: Line 7:
 ===== Care to Contribute? ===== ===== Care to Contribute? =====
  
-1. [[.:​testingpkgsrc|Orient yourself]] with pkgsrc+**1.** [[.:​testingpkgsrc|Orient yourself]] with pkgsrc
  
 +**2.** [[https://​github.com/​|Create an account]] and [[http://​help.github.com/​set-up-git-redirect|add SSH keys at GitHub]]
  
-2. [[https://​github.com/​|Create an account]] and [[http://help.github.com/set-up-git-redirect|add SSH keys at GitHub]]+**3.** [[http://help.github.com/​fork-a-repo/|Fork]] the [[https://​github.com/​pikpik/​minix-pkgsrc/|minix-pkgsrc repository from pikpik'​s]] to your own repository on GitHub
  
 +This saves your time and network bandwidth by downloading the repository only once.
  
-3[[http://​help.github.com/​fork-a-repo/​|Fork]] the [[https://​github.com/​pikpik/​minix-pkgsrc/​|minix-pkgsrc repository from pikpik'​s]] to your own repository ​on GitHub+**4.** Download your pkgsrc repository
  
- This saves your time and network bandwidth by downloading the repository only once. +First, download the official pkgsrc.
- +
- +
-4. Download your pkgsrc repository +
- +
- First, download the official pkgsrc.+
  
 <​code>​ <​code>​
Line 26: Line 23:
  
 $ make pkgsrc-create $ make pkgsrc-create
-  
 </​code>​ </​code>​
  
- Then, add your repository as a remote repository.+Then, add your repository as a remote repository.
  
 <​code>​ <​code>​
Line 39: Line 35:
  
 $ git branch unofficial-minix-master unofficial/​minix-master $ git branch unofficial-minix-master unofficial/​minix-master
-  
 </​code>​ </​code>​
  
- <!> Note: If you use ''​https://''​ in place of ''​git://''​ and have an SSL-related problem when you fetch, then please use the following steps to install SSL certificates.+<!> Note: If you use ''​%%https://%%''​ in place of ''​%%git://%%''​ and have an SSL-related problem when you fetch, then please use the following steps to install SSL certificates.
  
 <​code>​ <​code>​
Line 54: Line 49:
  
 $ mozilla-rootcerts rehash $ mozilla-rootcerts rehash
-  
 </​code>​ </​code>​
  
-5. Check-out the minix-master branch locally+**5.** Check-out the minix-master branch locally
  
 <​code>​ <​code>​
 $ git checkout unofficial-minix-master $ git checkout unofficial-minix-master
-  
 </​code>​ </​code>​
  
-6. Create a new branch from it to host your work+**6.** Create a new branch from it to host your work
  
 <​code>​ <​code>​
Line 70: Line 63:
  
 $ git checkout my-package-branch $ git checkout my-package-branch
-  
 </​code>​ </​code>​
  
-7. Push this branch to your remote repository+**7.** Push this branch to your remote repository
  
 <​code>​ <​code>​
 $ git push unofficial my-package-branch $ git push unofficial my-package-branch
-  
 </​code>​ </​code>​
  
- This will create the reference work for others to test and later include in the volunteer pkgsrc.+This will create the reference work for others to test and later include in the volunteer pkgsrc.
  
  
-8. Hack locally, commit, test, pkglint, etc.+**8.** Hack locally, commit, test, pkglint, etc.
  
- Instructions for building packages can be found on the [[.:​testingpkgsrc|Testing Pkgsrc]] page.+Instructions for building packages can be found on the [[.:​testingpkgsrc|Testing Pkgsrc]] page.
  
-9. Push up the ongoing work for other people to test it+**9.** Push up the ongoing work for other people to test it
  
 <​code>​ <​code>​
 $ git push unofficial my-package-branch $ git push unofficial my-package-branch
-  
 </​code>​ </​code>​
  
-10. Let people on the mailing list know about it+**10.** Let people on the mailing list know about it
  
- Please include in your message the name of the branch and the public address to your repository.+Please include in your message the name of the branch and the public address to your repository.
  
  
-11. Periodically merge changes from minix-master into your branch+**11.** Periodically merge changes from minix-master into your branch
  
 <​code>​ <​code>​
Line 107: Line 97:
  
 $ git merge unofficial-minix-master $ git merge unofficial-minix-master
-  
 </​code>​ </​code>​
  
- This eases later work, and also will grab the good work done elsewhere on the dependencies. ;-) +This eases later work, and also will grab the good work done elsewhere on the dependencies. ;-)
  
-12. Continue testing and pushing your local branch up to your repository 
  
 +**12.** Continue testing and pushing your local branch up to your repository
  
-13. When your branch is ready, open an issue on [[https://​github.com/​pikpik/​minix-pkgsrc/​issues|the issue tracker of the volunteer pkgsrc]]+**13.** When your branch is ready, open an issue on [[https://​github.com/​pikpik/​minix-pkgsrc/​issues|the issue tracker of the volunteer pkgsrc]]
  
 <​code>​ <​code>​
Line 126: Line 114:
  
 Thanks Thanks
-  
 </​code>​ </​code>​
  
- When the committee agrees with the current state of the package as published in your GitHub repository, they will copy the branch into the volunteer pkgsrc repository and prepare it for inclusion into the official pkgsrc.+When the committee agrees with the current state of the package as published in your GitHub repository, they will copy the branch into the volunteer pkgsrc repository and prepare it for inclusion into the official pkgsrc.
  
  
Line 136: Line 123:
 As upstream changes from the official pkgsrc repository become available, updating your repository allows your changes to merge cleanly in the future. As upstream changes from the official pkgsrc repository become available, updating your repository allows your changes to merge cleanly in the future.
  
-1. Update the official branch+**1.** Update the official branch
  
 <​code>​ <​code>​
Line 144: Line 131:
  
 $ make pkgsrc-update $ make pkgsrc-update
-  
 </​code>​ </​code>​
  
-2. Make your unofficial branch identical to the official one+**2.** Make your unofficial branch identical to the official one
  
 <​code>​ <​code>​
Line 155: Line 141:
  
 $ git rebase minix-master $ git rebase minix-master
-  
 </​code>​ </​code>​
  
-3. Merge changes from either the official or unofficial branch into your own+**3.** Merge changes from either the official or unofficial branch into your own
  
 <​code>​ <​code>​
Line 164: Line 149:
  
 $ git merge unofficial-minix-master $ git merge unofficial-minix-master
-  
 </​code>​ </​code>​
  
volunteerpkgsrc.txt · Last modified: 2016/03/30 20:10 by bleakgadfly