diff options
Diffstat (limited to 'documentation/dev-manual/dev-manual-kernel-appendix.xml')
| -rw-r--r-- | documentation/dev-manual/dev-manual-kernel-appendix.xml | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml index 0836fe9335..58f33e8ef3 100644 --- a/documentation/dev-manual/dev-manual-kernel-appendix.xml +++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" | 1 | <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" |
| 2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> | 2 | "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" |
| 3 | [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] > | ||
| 3 | 4 | ||
| 4 | <appendix id='dev-manual-kernel-appendix'> | 5 | <appendix id='dev-manual-kernel-appendix'> |
| 5 | 6 | ||
| @@ -43,10 +44,15 @@ | |||
| 43 | structures you need. | 44 | structures you need. |
| 44 | Briefly, you need the following: | 45 | Briefly, you need the following: |
| 45 | <itemizedlist> | 46 | <itemizedlist> |
| 46 | <listitem><para>A local Yocto Project files Git repository</para></listitem> | 47 | <listitem><para>A local |
| 47 | <listitem><para>The <filename>poky-extras</filename> Git repository placed | 48 | <link linkend='yocto-project-files'>Yocto Project Files</link> |
| 48 | within the local Yocto Project files Git repository</para></listitem> | 49 | Git repository</para></listitem> |
| 49 | <listitem><para>A bare clone of the Linux Yocto kernel upstream Git | 50 | <listitem><para>The |
| 51 | <link linkend='poky-extras-repo'><filename>poky-extras</filename></link> | ||
| 52 | Git repository placed within the local Yocto Project files Git | ||
| 53 | repository</para></listitem> | ||
| 54 | <listitem><para>A bare clone of the | ||
| 55 | <link linkend='local-kernel-files'>Linux Yocto Kernel</link> upstream Git | ||
| 50 | repository to which you want to push your modifications. | 56 | repository to which you want to push your modifications. |
| 51 | </para></listitem> | 57 | </para></listitem> |
| 52 | <listitem><para>A copy of that bare clone in which you make your source | 58 | <listitem><para>A copy of that bare clone in which you make your source |
| @@ -154,9 +160,9 @@ | |||
| 154 | The following commands create and checkout the local <filename>edison</filename> | 160 | The following commands create and checkout the local <filename>edison</filename> |
| 155 | branch: | 161 | branch: |
| 156 | <literallayout class='monospaced'> | 162 | <literallayout class='monospaced'> |
| 157 | $ git checkout -b edison origin/edison | 163 | $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; |
| 158 | Branch edison set up to track remote branch edison from origin. | 164 | Branch edison set up to track remote branch &DISTRO_NAME; from origin. |
| 159 | Switched to a new branch 'edison' | 165 | Switched to a new branch '&DISTRO_NAME;' |
| 160 | </literallayout> | 166 | </literallayout> |
| 161 | </para> | 167 | </para> |
| 162 | </section> | 168 | </section> |
| @@ -539,14 +545,14 @@ | |||
| 539 | $ git branch -a | 545 | $ git branch -a |
| 540 | $ git tag -l | 546 | $ git tag -l |
| 541 | </literallayout> | 547 | </literallayout> |
| 542 | This example uses the Yocto Project 1.1.1 Release code named "edison", | 548 | This example uses the Yocto Project 1.1.1 Release code named "&DISTRO_NAME;", |
| 543 | which maps to the <filename>edison</filename> branch in the repository. | 549 | which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. |
| 544 | The following commands create and checkout the local <filename>edison</filename> | 550 | The following commands create and checkout the local <filename>&DISTRO_NAME;</filename> |
| 545 | branch: | 551 | branch: |
| 546 | <literallayout class='monospaced'> | 552 | <literallayout class='monospaced'> |
| 547 | $ git checkout -b edison origin/edison | 553 | $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; |
| 548 | Branch edison set up to track remote branch edison from origin. | 554 | Branch edison set up to track remote branch &DISTRO_NAME; from origin. |
| 549 | Switched to a new branch 'edison' | 555 | Switched to a new branch '&DISTRO_NAME;' |
| 550 | </literallayout> | 556 | </literallayout> |
| 551 | </para> | 557 | </para> |
| 552 | 558 | ||
