summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2011-09-20 09:50:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-25 17:59:59 +0100
commit5031ba1f3d539052d45cd8aafff2c66ac20a4e3d (patch)
tree7ee6c848e877881b1c592bd55dabf522b3ea3559 /documentation/dev-manual
parent7021e04af84f4efb00c9a5e7d6f154e2ce401e09 (diff)
downloadpoky-5031ba1f3d539052d45cd8aafff2c66ac20a4e3d.tar.gz
documentation/dev-manual/dev-manual-kernel-appendix.xml: Robert Berger feedback.
somehow I lost three or four changes that are credited to Robert Berger (Community Member). I have re-introduced them here. (From yocto-docs rev: a23564ada0e072bea63739aeb1eb5c66d595e728) 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')
-rw-r--r--documentation/dev-manual/dev-manual-kernel-appendix.xml16
1 files changed, 12 insertions, 4 deletions
diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml
index 68b7642a97..f62e0b0291 100644
--- a/documentation/dev-manual/dev-manual-kernel-appendix.xml
+++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml
@@ -114,9 +114,14 @@
114 Any changes you make to files in this location need to ultimately be pushed 114 Any changes you make to files in this location need to ultimately be pushed
115 to the bare clone using the <filename>git push</filename> command.</para> 115 to the bare clone using the <filename>git push</filename> command.</para>
116 <para>See the bulleted item 116 <para>See the bulleted item
117 <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in 117 "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>" earlier in this manual
118 <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
119 for information on how to set up the bare clone. 118 for information on how to set up the bare clone.
119 <note>Typically, Git workflows follow a scheme where changes made to a local area
120 are pulled into a Git repository.
121 However, because the <filename>git pull</filename> command does not work
122 with bare clones, this workflow pushes changes to the
123 repository even though other more complicated methods do exist that
124 get changes into the bare clone.</note>
120 </para></listitem> 125 </para></listitem>
121 </itemizedlist> 126 </itemizedlist>
122 </para> 127 </para>
@@ -605,9 +610,12 @@
605 when it is built. 610 when it is built.
606 You can find and examine this file in the Yocto Project files Git repository in 611 You can find and examine this file in the Yocto Project files Git repository in
607 the build directory. 612 the build directory.
608 This example uses the following: 613 This example uses the following.
614 Note that this example directory is arificially split in order to make it more
615 readable:
609 <literallayout class='monospaced'> 616 <literallayout class='monospaced'>
610 ~/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git1+84f...r20/linux-qemux86-standard-build 617 ~/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git1+84f...
618 ...r20/linux-qemux86-standard-build
611 </literallayout> 619 </literallayout>
612 </para> 620 </para>
613 621