diff options
| author |   Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-03-24 17:17:43 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-25 12:29:45 +0000 |
| commit | b80943fc47503eb4c6650b7ddd9518a30e1fad85 (patch) | |
| tree | d4028496f8ee84a048f8e173257643ca3eb78821 /documentation/dev-manual/dev-manual-newbie.xml | |
| parent | b990aa8b1bf014fcc662da744f595f44eb8352b9 (diff) | |
| download | openembedded-core-contrib-b80943fc47503eb4c6650b7ddd9518a30e1fad85.tar.gz | |
dev-manual: Added notes saying you need to work from same branches
Fixes [YOCTO #4601]
Added a couple notes saying that you need to be in matching
branches for meta-intel and poky.
(From yocto-docs rev: 02bd63829b1d98f21183a10707753e9767bfe68e)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/dev-manual/dev-manual-newbie.xml')
| -rw-r--r-- | documentation/dev-manual/dev-manual-newbie.xml | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/documentation/dev-manual/dev-manual-newbie.xml b/documentation/dev-manual/dev-manual-newbie.xml index 77c14a6611..1245345cc4 100644 --- a/documentation/dev-manual/dev-manual-newbie.xml +++ b/documentation/dev-manual/dev-manual-newbie.xml @@ -431,12 +431,27 @@ <filename>poky</filename> repository or any supported BSP tarballs. Unpacking these tarballs gives you a snapshot of the released files. - <note> - The recommended method for setting up the Yocto Project - <link linkend='source-directory'>Source Directory</link> and the - files for supported BSPs (e.g., <filename>meta-intel</filename>) is to - use <link linkend='git'>Git</link> to create a local copy of the - upstream repositories. + <note><title>Notes</title> + <itemizedlist> + <listitem><para> + The recommended method for setting up the Yocto Project + <link linkend='source-directory'>Source Directory</link> + and the files for supported BSPs + (e.g., <filename>meta-intel</filename>) is to use + <link linkend='git'>Git</link> to create a local copy of + the upstream repositories. + </para></listitem> + <listitem><para> + Be sure to always work in matching branches for both + the <filename>meta-intel</filename> repository and the + <link linkend='source-directory'>Source Directory</link> + (i.e. <filename>poky</filename>) repository. + For example, if you have checked out the "master" branch + of <filename>poky</filename> and you are going to use + <filename>meta-intel</filename>, be sure to checkout the + "master" branch of <filename>meta-intel</filename>. + </para></listitem> + </itemizedlist> </note> </para> |