summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-10-05 12:05:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-06 18:51:21 +0100
commit720446629bec50ff9dbfb2641585610da3579b43 (patch)
tree2b66324f6691de14c6bd1ff731a6187308d0b498
parentdb9d36f1965a87752fcd5f750cac9ea03b815ec6 (diff)
downloadpoky-720446629bec50ff9dbfb2641585610da3579b43.tar.gz
documentation/yocto-project-qs/yocto-project-qs.xml: release name and misc.
I somehow had either dreamed the word "einstein" into the release for 1.1 and had it in there as part of the tarball name, etc. I have replaced this obviously with "edison." Other edits involved making the references to outside documents more consistent. (From yocto-docs rev: 2407b7dd89712c489d515e97d44e3c7dc0b64d20) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/yocto-project-qs/yocto-project-qs.xml27
1 files changed, 14 insertions, 13 deletions
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 3c092e5701..71fb0ab729 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -36,9 +36,9 @@
36 <para> 36 <para>
37 Finally, you might find the Frequently Asked Questions (FAQ) for the Yocto Project 37 Finally, you might find the Frequently Asked Questions (FAQ) for the Yocto Project
38 at <ulink url='https://wiki.yoctoproject.org/wiki/FAQ'>Yocto Project FAQ</ulink> and 38 at <ulink url='https://wiki.yoctoproject.org/wiki/FAQ'>Yocto Project FAQ</ulink> and
39 the FAQ appendix located in the 39 the FAQ appendix located in
40 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'> 40 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
41 Yocto Project Reference Manual</ulink> helpful. 41 The Yocto Project Reference Manual</ulink> helpful.
42 </para> 42 </para>
43 <note> 43 <note>
44 Due to production processes, there could be differences between the Yocto Project 44 Due to production processes, there could be differences between the Yocto Project
@@ -316,16 +316,16 @@
316 through a set of locations. 316 through a set of locations.
317 If you encounter problems with the Yocto Project finding and downloading source code, see 317 If you encounter problems with the Yocto Project finding and downloading source code, see
318 the FAQ entry "How does Poky obtain source code and will it work behind my 318 the FAQ entry "How does Poky obtain source code and will it work behind my
319 firewall or proxy server?" in the 319 firewall or proxy server?" in
320 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'> 320 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
321 Yocto Project Reference Manual</ulink>. 321 The Yocto Project Reference Manual</ulink>.
322 </para></note> 322 </para></note>
323 323
324 <para> 324 <para>
325 <literallayout class='monospaced'> 325 <literallayout class='monospaced'>
326 $ wget http://www.yoctoproject.org/downloads/poky/poky-einstein-6.0.tar.bz2 326 $ wget http://www.yoctoproject.org/downloads/poky/poky-edison-6.0.tar.bz2
327 $ tar xjf poky-einstein-6.0.tar.bz2 327 $ tar xjf poky-edison-6.0.tar.bz2
328 $ source poky-einstein-6.0/oe-init-build-env einstein-6.0-build 328 $ source poky-edison-6.0/oe-init-build-env edison-6.0-build
329 </literallayout> 329 </literallayout>
330 </para> 330 </para>
331 331
@@ -333,7 +333,7 @@
333 To help conserve disk space during builds, you can add the following statement 333 To help conserve disk space during builds, you can add the following statement
334 to your <filename>local.conf</filename> file in the Yocto Project build 334 to your <filename>local.conf</filename> file in the Yocto Project build
335 directory, which for this example 335 directory, which for this example
336 is <filename>einstein-6.0-build</filename>. 336 is <filename>edison-6.0-build</filename>.
337 Adding this statement deletes the work directory used for building a package 337 Adding this statement deletes the work directory used for building a package
338 once the package is built. 338 once the package is built.
339 <literallayout class='monospaced'> 339 <literallayout class='monospaced'>
@@ -349,14 +349,14 @@
349 <ulink url='http://www.yoctoproject.org'>Yocto Project website</ulink> downloads 349 <ulink url='http://www.yoctoproject.org'>Yocto Project website</ulink> downloads
350 area to retrieve the tarball.</para></listitem> 350 area to retrieve the tarball.</para></listitem>
351 <listitem><para>The second command extracts the files from the tarball and places 351 <listitem><para>The second command extracts the files from the tarball and places
352 them into a directory named <filename>poky-einstein-6.0</filename> in the current 352 them into a directory named <filename>poky-edison-6.0</filename> in the current
353 directory. 353 directory.
354 </para></listitem> 354 </para></listitem>
355 <listitem><para>The third command runs the Yocto Project environment setup script. 355 <listitem><para>The third command runs the Yocto Project environment setup script.
356 Running this script defines Yocto Project build environment settings needed to 356 Running this script defines Yocto Project build environment settings needed to
357 complete the build. 357 complete the build.
358 The script also creates the Yocto Project 358 The script also creates the Yocto Project
359 build directory, which is <filename>einstein-6.0-build</filename> in this case. 359 build directory, which is <filename>edison-6.0-build</filename> in this case.
360 After the script runs, your current working directory is set 360 After the script runs, your current working directory is set
361 to the build directory. 361 to the build directory.
362 Later, when the build completes, the build directory contains all the files 362 Later, when the build completes, the build directory contains all the files
@@ -410,15 +410,16 @@
410 <filename>core-image-sato</filename> in this example. 410 <filename>core-image-sato</filename> in this example.
411 For information on the <filename>-k</filename> option use the 411 For information on the <filename>-k</filename> option use the
412 <filename>bitbake --help</filename> command or see the 412 <filename>bitbake --help</filename> command or see the
413 "<ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>BitBake</ulink>" section in the Yocto Project Reference Manual. 413 "<ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>BitBake</ulink>" section in
414 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>The Yocto Project Reference Manual</ulink>.
414 <literallayout class='monospaced'> 415 <literallayout class='monospaced'>
415 $ bitbake -k core-image-sato 416 $ bitbake -k core-image-sato
416 </literallayout> 417 </literallayout>
417 <note><para> 418 <note><para>
418 BitBake requires Python 2.6 or 2.7. For more information on this requirement, 419 BitBake requires Python 2.6 or 2.7. For more information on this requirement,
419 see the FAQ appendix in the 420 see the FAQ appendix in
420 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'> 421 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
421 Yocto Project Reference Manual</ulink>. 422 The Yocto Project Reference Manual</ulink>.
422 </para></note> 423 </para></note>
423 The final command runs the image: 424 The final command runs the image:
424 <literallayout class='monospaced'> 425 <literallayout class='monospaced'>