diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2017-09-21 13:15:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-22 17:53:44 +0100 |
commit | b673c3b9907aacbb3d30f95a7f7787b6d9f6f699 (patch) | |
tree | 14d4a4d60ce437228d8ea34d6123b30413c53dea | |
parent | b103ff6ba7a91d5bc83816f300b95361de8e700f (diff) | |
download | poky-b673c3b9907aacbb3d30f95a7f7787b6d9f6f699.tar.gz |
dev-manual: Replaced release names and numbers with variables
In several examples, hardcoded versions of release names and
versions were being used. I updated to use variables from
poky.ent so that examples would use most recent release.
(From yocto-docs rev: 53f8e92075cc34538f36d7fba392ea1ac9a6dd1f)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/dev-manual/dev-manual-start.xml | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/documentation/dev-manual/dev-manual-start.xml b/documentation/dev-manual/dev-manual-start.xml index a62825122f..5981645224 100644 --- a/documentation/dev-manual/dev-manual-start.xml +++ b/documentation/dev-manual/dev-manual-start.xml | |||
@@ -354,9 +354,9 @@ | |||
354 | <listitem><para> | 354 | <listitem><para> |
355 | <emphasis>Find the Tarball:</emphasis> | 355 | <emphasis>Find the Tarball:</emphasis> |
356 | Drill down to find the associated tarball. | 356 | Drill down to find the associated tarball. |
357 | For example, click on <filename>yocto-2.3</filename> to | 357 | For example, click on <filename>yocto-&DISTRO;</filename> to |
358 | view files associated with the Yocto Project 2.3 | 358 | view files associated with the Yocto Project &DISTRO; |
359 | release (e.g. <filename>poky-pyro-17.0.0tar.bz2</filename>, | 359 | release (e.g. <filename>poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;.tar.bz2</filename>, |
360 | which is the released Poky tarball). | 360 | which is the released Poky tarball). |
361 | </para></listitem> | 361 | </para></listitem> |
362 | <listitem><para> | 362 | <listitem><para> |
@@ -545,21 +545,22 @@ | |||
545 | remotes/origin/pinky | 545 | remotes/origin/pinky |
546 | remotes/origin/purple | 546 | remotes/origin/purple |
547 | remotes/origin/pyro | 547 | remotes/origin/pyro |
548 | remotes/origin/rocko | ||
548 | </literallayout> | 549 | </literallayout> |
549 | </para></listitem> | 550 | </para></listitem> |
550 | <listitem><para> | 551 | <listitem><para> |
551 | <emphasis>Checkout the Branch:</emphasis> | 552 | <emphasis>Checkout the Branch:</emphasis> |
552 | Checkout the development branch in which you want to work. | 553 | Checkout the development branch in which you want to work. |
553 | For example, to access the files for the Yocto Project | 554 | For example, to access the files for the Yocto Project |
554 | 2.3 Release (Pyro), use the following command: | 555 | &DISTRO; Release (&DISTRO_NAME;), use the following command: |
555 | <literallayout class='monospaced'> | 556 | <literallayout class='monospaced'> |
556 | $ git checkout -b pyro origin/pyro | 557 | $ git checkout -b &DISTRO_NAME_NO_CAP; origin/&DISTRO_NAME_NO_CAP; |
557 | Branch pyro set up to track remote branch pyro from origin. | 558 | Branch &DISTRO_NAME_NO_CAP; set up to track remote branch &DISTRO_NAME_NO_CAP; from origin. |
558 | Switched to a new branch 'pyro' | 559 | Switched to a new branch '&DISTRO_NAME_NO_CAP;' |
559 | </literallayout> | 560 | </literallayout> |
560 | The previous command checks out the "pyro" development | 561 | The previous command checks out the "&DISTRO_NAME_NO_CAP;" |
561 | branch and reports that the branch is tracking the upstream | 562 | development branch and reports that the branch is tracking |
562 | "origin/pyro" branch.</para> | 563 | the upstream "origin/&DISTRO_NAME_NO_CAP;" branch.</para> |
563 | 564 | ||
564 | <para>The following command displays the branches | 565 | <para>The following command displays the branches |
565 | that are now part of your local poky repository. | 566 | that are now part of your local poky repository. |
@@ -568,7 +569,7 @@ | |||
568 | <literallayout class='monospaced'> | 569 | <literallayout class='monospaced'> |
569 | $ git branch | 570 | $ git branch |
570 | master | 571 | master |
571 | * pyro | 572 | * &DISTRO_NAME_NO_CAP; |
572 | </literallayout> | 573 | </literallayout> |
573 | </para></listitem> | 574 | </para></listitem> |
574 | </orderedlist> | 575 | </orderedlist> |
@@ -626,27 +627,29 @@ | |||
626 | yocto-2.2 | 627 | yocto-2.2 |
627 | yocto-2.2.1 | 628 | yocto-2.2.1 |
628 | yocto-2.3 | 629 | yocto-2.3 |
630 | yocto-2.3.1 | ||
631 | yocto-2.4 | ||
629 | yocto_1.5_M5.rc8 | 632 | yocto_1.5_M5.rc8 |
630 | </literallayout> | 633 | </literallayout> |
631 | </para></listitem> | 634 | </para></listitem> |
632 | <listitem><para> | 635 | <listitem><para> |
633 | <emphasis>Checkout the Branch:</emphasis> | 636 | <emphasis>Checkout the Branch:</emphasis> |
634 | <literallayout class='monospaced'> | 637 | <literallayout class='monospaced'> |
635 | $ git checkout tags/2.2_M2 -b my_yocto_2.2_M2 | 638 | $ git checkout tags/&DISTRO; -b my_yocto_&DISTRO; |
636 | Switched to a new branch 'my_yocto_2.2_M2' | 639 | Switched to a new branch 'my_yocto_&DISTRO;' |
637 | $ git branch | 640 | $ git branch |
638 | master | 641 | master |
639 | * my_yocto_2.2_M2 | 642 | * my_yocto_&DISTRO; |
640 | </literallayout> | 643 | </literallayout> |
641 | The previous command creates and checks out a local | 644 | The previous command creates and checks out a local |
642 | branch named "my_yocto_2.2_M2", which is based on | 645 | branch named "my_yocto_&DISTRO;", which is based on |
643 | the commit in the upstream poky repository that has | 646 | the commit in the upstream poky repository that has |
644 | the same tag. | 647 | the same tag. |
645 | In this example, the files you have available locally | 648 | In this example, the files you have available locally |
646 | as a result of the <filename>checkout</filename> | 649 | as a result of the <filename>checkout</filename> |
647 | command are a snapshot of the | 650 | command are a snapshot of the |
648 | "morty" development branch at the point where | 651 | "&DISTRO_NAME_NO_CAP;" development branch at the point |
649 | milestone two was reached. | 652 | where Yocto Project &DISTRO; was released. |
650 | </para></listitem> | 653 | </para></listitem> |
651 | </orderedlist> | 654 | </orderedlist> |
652 | </para> | 655 | </para> |