summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-01-31 18:24:48 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-08 12:07:46 -0800
commit81629e3aa5c8e49d7c715223796aa7083ebfe96b (patch)
tree4f5a6ad0964292b381ce2e40e6fbde21d7351064 /documentation/dev-manual
parent62907f76bcd0cb8b255dedb8182be7ada2779c24 (diff)
downloadpoky-81629e3aa5c8e49d7c715223796aa7083ebfe96b.tar.gz
documentation/dev-manual/dev-manual-bsp-appendix.xml: edits to poky repo setup
There is confusion as to how to set up the Git repository and be sure you have the snapshot of the release. I have changed the description to use a tag rather than the branch names. The stuff is out for review with Josh. (From yocto-docs rev: 2521873e1bf8e1ad398fae4b7297f8746a34258f) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual')
-rw-r--r--documentation/dev-manual/dev-manual-bsp-appendix.xml30
1 files changed, 23 insertions, 7 deletions
diff --git a/documentation/dev-manual/dev-manual-bsp-appendix.xml b/documentation/dev-manual/dev-manual-bsp-appendix.xml
index aecb24f725..51fb3f4f4f 100644
--- a/documentation/dev-manual/dev-manual-bsp-appendix.xml
+++ b/documentation/dev-manual/dev-manual-bsp-appendix.xml
@@ -55,21 +55,37 @@
55 55
56 <para> 56 <para>
57 Once you have the local <filename>poky</filename> Git repository set up, 57 Once you have the local <filename>poky</filename> Git repository set up,
58 you have many development branches from which you can work. 58 you have all the development branches available to you from which you can work.
59 From inside the repository you can see the branch names and the tag names used 59 However, you need to be sure that your local repository reflects the specific
60 in the Git repository using either of the following two commands: 60 snapshot of the release you are interested in.
61 From inside the repository you can see the development branches that represent
62 areas of development that have diverged from the main (master) branch.
63 You can also see the tag names used to mark snapshots of stable releases or
64 points in the repository.
65 Use the following commands to list out the branches and the tags in the repository,
66 respectively.
61 <literallayout class='monospaced'> 67 <literallayout class='monospaced'>
62 $ git branch -a 68 $ git branch -a
63 $ git tag -l 69 $ git tag -l
64 </literallayout> 70 </literallayout>
65 For this example we are going to use the Yocto Project 1.1 Release, which is code 71 For this example, we are going to use the Yocto Project 1.1 Release, which is code
66 named "edison". 72 named "edison".
67 These commands create a local branch named <filename>edison</filename> 73 To make sure we have a local area (branch in Git terms) on our machine that tracks
68 that tracks the remote branch of the same name. 74 the snapshot of the 1.1 release, we can use the following commands:
69 <literallayout class='monospaced'> 75 <literallayout class='monospaced'>
70 $ git checkout -b edison origin/edison 76 $ cd ~/poky
77 $ git fetch --tags
78 $ git checkout edison-6.0 -b edison
71 Switched to a new branch 'edison' 79 Switched to a new branch 'edison'
72 </literallayout> 80 </literallayout>
81 The <filename>git fetch --tags</filename> is somewhat redundant since you just set
82 up the repository and should have all the tags.
83 The <filename>fetch</filename> command makes sure all the tags are available in your
84 local repository.
85 The Git <filename>checkout</filename> command with the <filename>-b</filename> option
86 creates a local branch for you named <filename>edison</filename>.
87 Your local branch tracks the Yocto Project 1.1 released tarball marked with the
88 <filename>edison-6.0</filename> tag in the source repositories.
73 </para> 89 </para>
74</section> 90</section>
75 91