diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-02-03 12:33:05 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-08 12:07:50 -0800 |
commit | 4d09a3c211159f097b7e68ac9e7d918a58daae8b (patch) | |
tree | 8649030fe3b13f8e4219668c481a37ebdabc5f4a /documentation/dev-manual | |
parent | deddea16d2c0f86bdf7906efb4560be81b537949 (diff) | |
download | poky-4d09a3c211159f097b7e68ac9e7d918a58daae8b.tar.gz |
documentation/dev-manual/dev-manual-bsp-appendix.xml: Edits to examples
Updated the tarball and Git repo example in section where user
is getting the source files. I was not using the default
Yocto Project Files top-level name for the tarball method.
Reported-by: Joshua.lock <joshua.lock@intel.com>
(From yocto-docs rev: 770c6799ea58df3d81df8f466f1bb9878532a995)
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.xml | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/documentation/dev-manual/dev-manual-bsp-appendix.xml b/documentation/dev-manual/dev-manual-bsp-appendix.xml index 8a5ad73f86..50522a213b 100644 --- a/documentation/dev-manual/dev-manual-bsp-appendix.xml +++ b/documentation/dev-manual/dev-manual-bsp-appendix.xml | |||
@@ -35,15 +35,20 @@ | |||
35 | 35 | ||
36 | <para> | 36 | <para> |
37 | As mentioned, one way to get the Yocto Project files is to use Git to clone the | 37 | As mentioned, one way to get the Yocto Project files is to use Git to clone the |
38 | <filename>poky</filename> repository: | 38 | <filename>poky</filename> repository. |
39 | These commands create a local copy of the Git repository. | ||
40 | By default, the top-level directory of the repository is named <filename>poky</filename>: | ||
39 | <literallayout class='monospaced'> | 41 | <literallayout class='monospaced'> |
40 | $ git clone git://git.yoctoproject.org/poky | 42 | $ git clone git://git.yoctoproject.org/poky |
41 | $ cd poky | 43 | $ cd poky |
42 | </literallayout> | 44 | </literallayout> |
43 | Alternatively, you can start with the downloaded Poky "edison" tarball: | 45 | Alternatively, you can start with the downloaded Poky "edison" tarball. |
46 | These commands unpack the tarball into a Yocto Project File directory structure. | ||
47 | By default, the top-level directory of the file structure is named | ||
48 | <filename>poky-edison-6.0</filename>: | ||
44 | <literallayout class='monospaced'> | 49 | <literallayout class='monospaced'> |
45 | $ tar xfj poky-edison-6.0.tar.bz2 | 50 | $ tar xfj poky-edison-6.0.tar.bz2 |
46 | $ cd poky | 51 | $ cd poky-edison-6.0 |
47 | </literallayout> | 52 | </literallayout> |
48 | <note><para>If you're using the tarball method, you can ignore all the following steps that | 53 | <note><para>If you're using the tarball method, you can ignore all the following steps that |
49 | ask you to carry out Git operations. | 54 | ask you to carry out Git operations. |
@@ -56,8 +61,12 @@ | |||
56 | that represents a specific release. | 61 | that represents a specific release. |
57 | Fundamentally, this is different than having a local copy of the Yocto Project | 62 | Fundamentally, this is different than having a local copy of the Yocto Project |
58 | Git repository. | 63 | Git repository. |
59 | Given the tarball method, changes you make are building on top of a release, while | 64 | Given the tarball method, changes you make are building on top of a release. |
60 | you are tracking development when you use the Git repository method.</para></note> | 65 | With the Git repository method you have the ability to track development |
66 | and keep changes in revision control. | ||
67 | See the | ||
68 | "<link linkend='repositories-tags-and-branches'>Repositories, Tags, and Branches</link>" section | ||
69 | for more discussion around these differneces.</para></note> | ||
61 | </para> | 70 | </para> |
62 | 71 | ||
63 | <para> | 72 | <para> |
@@ -66,7 +75,8 @@ | |||
66 | Next, you need to be sure that your local repository reflects the exact | 75 | Next, you need to be sure that your local repository reflects the exact |
67 | release in which you are interested. | 76 | release in which you are interested. |
68 | From inside the repository you can see the development branches that represent | 77 | From inside the repository you can see the development branches that represent |
69 | areas of development that have diverged from the main (master) branch. | 78 | areas of development that have diverged from the main (master) branch |
79 | at some point, such as a branch to track a maintenance release's development. | ||
70 | You can also see the tag names used to mark snapshots of stable releases or | 80 | You can also see the tag names used to mark snapshots of stable releases or |
71 | points in the repository. | 81 | points in the repository. |
72 | Use the following commands to list out the branches and the tags in the repository, | 82 | Use the following commands to list out the branches and the tags in the repository, |