summaryrefslogtreecommitdiffstats
path: root/documentation/yocto-project-qs/yocto-project-qs.xml
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-04-06 12:32:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:11:59 +0100
commit133224fb3189f0a1d1c32b83a04b923d53c4e397 (patch)
tree5db0eb243bea00586baf0fb02eb09a9a168a44f2 /documentation/yocto-project-qs/yocto-project-qs.xml
parent3831ca0deeeffe512c32bb67cff94024e572ca29 (diff)
downloadpoky-133224fb3189f0a1d1c32b83a04b923d53c4e397.tar.gz
documentation: Fixed references using the DISTRO_NAME variable
With the introduction of a DISTRO_NAME_NO_CAP variable, the occurrences of the DISTRO_NAME variable had to be checked to see if they really should be using the "NO_CAP" variable instead. Output and actual branch names are case-sensitive. (From yocto-docs rev: 711a3255538298dd3c4bd2af8ad13bc2d159c872) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/yocto-project-qs/yocto-project-qs.xml')
-rw-r--r--documentation/yocto-project-qs/yocto-project-qs.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 63e5cfb475..e769121930 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -360,7 +360,7 @@
360 remote: Total 226790 (delta 165212), reused 225887 (delta 164327) 360 remote: Total 226790 (delta 165212), reused 225887 (delta 164327)
361 Receiving objects: 100% (226790/226790), 100.98 MiB | 263 KiB/s, done. 361 Receiving objects: 100% (226790/226790), 100.98 MiB | 263 KiB/s, done.
362 Resolving deltas: 100% (165212/165212), done. 362 Resolving deltas: 100% (165212/165212), done.
363 $ git checkout &DISTRO_NAME; 363 $ git checkout &DISTRO_NAME_NO_CAP;
364 </literallayout> 364 </literallayout>
365 You can also get the Yocto Project Files by downloading 365 You can also get the Yocto Project Files by downloading
366 Yocto Project releases from the 366 Yocto Project releases from the
@@ -464,12 +464,12 @@
464 Release: 464 Release:
465 <literallayout class='monospaced'> 465 <literallayout class='monospaced'>
466 $ cd ~/poky 466 $ cd ~/poky
467 $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME; 467 $ git checkout -b &DISTRO_NAME_NO_CAP; origin/&DISTRO_NAME_NO_CAP;
468 </literallayout> 468 </literallayout>
469 Git's <filename>checkout</filename> command checks out 469 Git's <filename>checkout</filename> command checks out
470 the current Yocto Project release into a local branch 470 the current Yocto Project release into a local branch
471 whose name matches the release (i.e. 471 whose name matches the release (i.e.
472 <filename>&DISTRO_NAME;</filename>). 472 <filename>&DISTRO_NAME_NO_CAP;</filename>).
473 The local branch tracks the upstream branch of the 473 The local branch tracks the upstream branch of the
474 same name. 474 same name.
475 Creating your own branch based on the released 475 Creating your own branch based on the released
@@ -643,8 +643,8 @@
643 (<filename>meta-intel</filename> and 643 (<filename>meta-intel</filename> and
644 <filename>poky</filename>) are using the same releases. 644 <filename>poky</filename>) are using the same releases.
645 Consequently, you need to checkout out the 645 Consequently, you need to checkout out the
646 "&DISTRO_NAME_NO_CAP;" release after cloning 646 "<filename>&DISTRO_NAME_NO_CAP;</filename>" release after
647 <filename>meta-intel</filename>: 647 cloning <filename>meta-intel</filename>:
648 <literallayout class='monospaced'> 648 <literallayout class='monospaced'>
649 $ cd $HOME/poky/meta-intel 649 $ cd $HOME/poky/meta-intel
650 $ git checkout &DISTRO_NAME_NO_CAP; 650 $ git checkout &DISTRO_NAME_NO_CAP;