From b673c3b9907aacbb3d30f95a7f7787b6d9f6f699 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Thu, 21 Sep 2017 13:15:21 -0700 Subject: 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 Signed-off-by: Richard Purdie --- documentation/dev-manual/dev-manual-start.xml | 37 +++++++++++++++------------ 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'documentation/dev-manual') 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 @@ Find the Tarball: Drill down to find the associated tarball. - For example, click on yocto-2.3 to - view files associated with the Yocto Project 2.3 - release (e.g. poky-pyro-17.0.0tar.bz2, + For example, click on yocto-&DISTRO; to + view files associated with the Yocto Project &DISTRO; + release (e.g. poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;.tar.bz2, which is the released Poky tarball). @@ -545,21 +545,22 @@ remotes/origin/pinky remotes/origin/purple remotes/origin/pyro + remotes/origin/rocko Checkout the Branch: Checkout the development branch in which you want to work. For example, to access the files for the Yocto Project - 2.3 Release (Pyro), use the following command: + &DISTRO; Release (&DISTRO_NAME;), use the following command: - $ git checkout -b pyro origin/pyro - Branch pyro set up to track remote branch pyro from origin. - Switched to a new branch 'pyro' + $ git checkout -b &DISTRO_NAME_NO_CAP; origin/&DISTRO_NAME_NO_CAP; + Branch &DISTRO_NAME_NO_CAP; set up to track remote branch &DISTRO_NAME_NO_CAP; from origin. + Switched to a new branch '&DISTRO_NAME_NO_CAP;' - The previous command checks out the "pyro" development - branch and reports that the branch is tracking the upstream - "origin/pyro" branch. + The previous command checks out the "&DISTRO_NAME_NO_CAP;" + development branch and reports that the branch is tracking + the upstream "origin/&DISTRO_NAME_NO_CAP;" branch. The following command displays the branches that are now part of your local poky repository. @@ -568,7 +569,7 @@ $ git branch master - * pyro + * &DISTRO_NAME_NO_CAP; @@ -626,27 +627,29 @@ yocto-2.2 yocto-2.2.1 yocto-2.3 + yocto-2.3.1 + yocto-2.4 yocto_1.5_M5.rc8 Checkout the Branch: - $ git checkout tags/2.2_M2 -b my_yocto_2.2_M2 - Switched to a new branch 'my_yocto_2.2_M2' + $ git checkout tags/&DISTRO; -b my_yocto_&DISTRO; + Switched to a new branch 'my_yocto_&DISTRO;' $ git branch master - * my_yocto_2.2_M2 + * my_yocto_&DISTRO; The previous command creates and checks out a local - branch named "my_yocto_2.2_M2", which is based on + branch named "my_yocto_&DISTRO;", which is based on the commit in the upstream poky repository that has the same tag. In this example, the files you have available locally as a result of the checkout command are a snapshot of the - "morty" development branch at the point where - milestone two was reached. + "&DISTRO_NAME_NO_CAP;" development branch at the point + where Yocto Project &DISTRO; was released. -- cgit v1.2.3-54-g00ecf