summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-04-05 13:02:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:11:58 +0100
commitaa4b72b61df06667c347017ffd2812b4c1e1a833 (patch)
tree057a8dbf7a7f90dc588a92221dd70f029637da10 /documentation
parentf2505afe1887ecbaf09e20ad7cfa06156ea1e7df (diff)
downloadpoky-aa4b72b61df06667c347017ffd2812b4c1e1a833.tar.gz
yocto-project-qs: Updated the minnowboard example.
Fixes [YOCTO #9386] Added some missing information: * Added instruction to be in the poky directory before cloning the meta-intel repository. * Removed the "source" part of the string for the bitbake-layer command. * Added text to describe that the user needs to be sure that the same branches are in play for poky and meta-intel before they launch the build. (From yocto-docs rev: 65461624691a566a5849c6d9df7b269c3de2eba7) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/yocto-project-qs/yocto-project-qs.xml36
1 files changed, 28 insertions, 8 deletions
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 8b31c049b1..63e5cfb475 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -598,7 +598,7 @@
598 </orderedlist> 598 </orderedlist>
599 </para> 599 </para>
600 600
601 <para> 601 <para id='qs-minnowboard-example'>
602 The following steps show how easy it is to set up to build an 602 The following steps show how easy it is to set up to build an
603 image for a new machine. 603 image for a new machine.
604 These steps build an image for the MinnowBoard MAX, which is 604 These steps build an image for the MinnowBoard MAX, which is
@@ -621,17 +621,36 @@
621 Building an image for the MinnowBoard MAX requires the 621 Building an image for the MinnowBoard MAX requires the
622 <filename>meta-intel</filename> layer. 622 <filename>meta-intel</filename> layer.
623 Use the <filename>git clone</filename> command to create 623 Use the <filename>git clone</filename> command to create
624 a local copy of the repository: 624 a local copy of the repository inside your
625 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink>,
626 which is <filename>poky</filename> in this example:
625 <literallayout class='monospaced'> 627 <literallayout class='monospaced'>
628 $ cd $HOME/poky
626 $ git clone git://git.yoctoproject.org/meta-intel 629 $ git clone git://git.yoctoproject.org/meta-intel
627 Cloning into 'meta-intel'... 630 Cloning into 'meta-intel'...
628 remote: Counting objects: 10824, done. 631 remote: Counting objects: 11988, done.
629 remote: Compressing objects: 100% (3508/3508), done. 632 remote: Compressing objects: 100% (3884/3884), done.
630 remote: Total 10824 (delta 6219), reused 10580 (delta 5975) 633 Receiving objects: 100% (11988/11988), 2.93 MiB | 2.51 MiB/s, done.
631 Receiving objects: 100% (10824/10824), 2.72 MiB | 482.00 KiB/s, done. 634 remote: Total 11988 (delta 6881), reused 11752 (delta 6645)
632 Resolving deltas: 100% (6219/6219), done. 635 Resolving deltas: 100% (6881/6881), done.
633 Checking connectivity... done. 636 Checking connectivity... done.
634 </literallayout> 637 </literallayout>
638 By default when you clone a Git repository, the
639 "master" branch is checked out.
640 Before you build your image that uses the
641 <filename>meta-intel</filename> layer, you must be
642 sure that both repositories
643 (<filename>meta-intel</filename> and
644 <filename>poky</filename>) are using the same releases.
645 Consequently, you need to checkout out the
646 "&DISTRO_NAME_NO_CAP;" release after cloning
647 <filename>meta-intel</filename>:
648 <literallayout class='monospaced'>
649 $ cd $HOME/poky/meta-intel
650 $ git checkout &DISTRO_NAME_NO_CAP;
651 Branch &DISTRO_NAME_NO_CAP; set up to track remote branch &DISTRO_NAME_NO_CAP; from origin.
652 Switched to a new branch '&DISTRO_NAME_NO_CAP;'
653 </literallayout>
635 </para></listitem> 654 </para></listitem>
636 <listitem><para><emphasis>Configure the Build:</emphasis> 655 <listitem><para><emphasis>Configure the Build:</emphasis>
637 To configure the build, you edit the 656 To configure the build, you edit the
@@ -650,7 +669,8 @@
650 <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink> 669 <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink>
651 variable. 670 variable.
652 <literallayout class='monospaced'> 671 <literallayout class='monospaced'>
653 $ bitbake-layers add-layer "$HOME/source/poky/meta-intel" 672 $ cd $HOME/poky/build
673 $ bitbake-layers add-layer "$HOME/poky/meta-intel"
654 $ echo 'MACHINE = "intel-corei7-64"' >> conf/local.conf 674 $ echo 'MACHINE = "intel-corei7-64"' >> conf/local.conf
655 </literallayout> 675 </literallayout>
656 <note><title>Notes</title> 676 <note><title>Notes</title>