Hi David, I think I've made all the changes you have requested. When you have a chance, please cast an eye over the wiki page at:
https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster Let me know if you need any further changes (or feel free to make them yourself, whichever is easier for you). Cheers Belén On 05/02/2014 07:13, "Reyna, David" <[email protected]> wrote: >Hi Belen, > >FYI, here are some updates to the Contribute_to_Toaster wiki page. > >The main note is that the ³remote² is setup under ³contrib² (marked below >in blue), so any pushes should also be under ³contrib² (marked below in >red). > >Also, there is Alex¹s comment about removing extra whitespace at the end >of lines, plus using the ³-f² for when you re-push your own branch with >changes. > >- David > > >[[ Set up the local repository ]] > > >(1) Select a Yocto-1.5 compatible host, and install Django-1.5. The "pip" >application is recommended to manage the install process. > > https://www.djangoproject.com/download/ > > $ sudo apt-get install pip > $ sudo pip uninstall django > $ sudo pip install django==1.5 > $ sudo pip install South==0.8.4 > > >(2) Setup a local repository for the development branch > > $ cd <installdir> > $ git clone git://git.yoctoproject.org/poky > $ cd poky > $ git remote add contrib >http://git.yoctoproject.org/git/poky-contrib ><http://git.yoctoproject.org/git/poky-contrib> > $ git fetch contrib > $ git checkout contrib/toaster/master -b toaster-master > ># Also, setup up your branch for pushes to Yocto poky-contrib > > $ git remote set-url contrib [email protected]:poky-contrib > > >[[ Set up the project and Toaster interface ]] > > >(3) Create a project, with toaster database capture enabled > > $ cd <installdir> > $ source poky/oe-init-build-env > $ cd build > $ source toaster start > $ bitbake core-image-minimal > ># NOTE: the Toaster MUST be started before the project's build, else ># no data will be captured. You can recover a working (if sparse) ># database if you do this to execute a quick re-build. > > $ source toaster start > $ bitbake -c cleansstate base-files > $ bitbake core-image-minimal > > >(4) Run the toaster interface > > $ xdg-open http://localhost:8000/ > ># NOTE: You can alternatively open your browser manually to: > > http://localhost:8000/ > > >[[ Edit and submit content for review ]] > > >(5) Create a local branch > ># NOTE: the branch name is generally of the form >"<username>/<a_name_for_the_branch>", ># for example "dreyna/recipe-detail-view". You can choose any user name >and send it ># to Michael Halstead <[email protected]> together with your >SSL public key ># to enable your pushes to "poky-contrib". > >Example: > $ git checkout -b dreyna/recipe-detail-view > > >(6) Edit and test your content. > >(7) Validate your code > > (a) Make sure that all files are in Unix format (and not say DOS by >accident) > (b) Fix any whitespace at the end of line; i.e, there should not be >whitespace on any line before \n; > > > $ sed -i "s/[[:space:]]\+$//" <file> > > (c) All rendered pages should be validated for HTML format compliance. > Here are some suggested HTML validators: > > * Firebug (https://getfirebug.com/) > * HtmlValidator (http://users.skynet.be/mgueury/mozilla/) > > >(7) Set up your commit(s). The same push can have several partitioned >commits. > > (a) Add the content for the commit > > $ cd <installdir>/poky > $ git add [-p] bitbake/lib/toaster/... > >NOTE: the "-p" patch interactive option can help you preview the changes. > > (b) Create the commit. > > $ git commit -s > ># NOTE: The format of the commit should be as the following: > >vvvvvvvvvvvvvvvvvvvvvvvvv >bitbake: toaster: <short one line summary> > ><long(er) description, can be multi-line, should break at around 60 chars> > >[YOCTO #0000] # Add this line when directly addressing a >Bugzilla issue > >Signed-off-by: First Last <[email protected]> >^^^^^^^^^^^^^^^^^^^^^^^^^ > >See this link for more detail on Poky contributions is here: > >http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines ><http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines> > > >(8) Push your branch for review. You may need the "-f" if this is a >commit update, >which should be fine since the push is to a private branch mananged only >by you. > >The argument to rebase is a ref (branch name, tag name, hash, etc.). > > $ git push [-f] contrib <BRANCH_NAME> > >See it on the web using the branch name, for example: > > >http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/?h=dreyna%2Frecipe- >detail-view ><http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/?h=dreyna%2Frecipe >-detail-view> > > >(9) Send an email to "[email protected]" with the following >content. > > (a) A brief description of the review request together with the branch >name > > (b) Any technical details to call out to reviewers > > (c) Any limitations, assumptions, dependencies, and/or differed work > > (d) A test plan that demonstrates how the feature was and should be >tested > with sufficient detail for general testers and > documentation writers. > > >[[ Rebase your repository from master ]] > > >(10) To update your repository to the latest content, rebase it (as >opposed to attempting a merge, which can lose history). > > $ cd <installdir>/poky > $ git fetch > $ git rebase [-i] contrib/toaster/master > >Alex writes: You need to rebase on top of toaster/master. The way that I >do is: > * I have a local toaster/master which follows upstream >poky-contrib/toaster/master > * I have my development branch based on the local toaster/master > When I need to rebase, > * I do git pull on the local toaster/master branch, and then > * move to the development branch and do git rebase -i toaster/master > > _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
