summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual/dev-manual-common-tasks.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-10-22 09:02:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-23 00:03:16 +0100
commit767b28ea55cd47f29fd3402aa20a2654bf2ba51f (patch)
tree72cbd8fabe49d10ba5b62215927d12a291f93c04 /documentation/dev-manual/dev-manual-common-tasks.xml
parentdfeea177d339f90c4a5f54ec1cab4d81c2807413 (diff)
downloadpoky-767b28ea55cd47f29fd3402aa20a2654bf2ba51f.tar.gz
documentation: dev-manual - Updates to Git workflow and kernel patch
I updated the sections on the "Git Workflow" in Chapter 4 and the "Patching the Kernel" section in Chapter 5 per Tom Zanussi's review comments. Minor technical changes. (From yocto-docs rev: fd8a291349c06328adebd37f8a9bbeaa49adb44c) 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-common-tasks.xml')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index df64e1124e..2f73e28829 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -1726,10 +1726,10 @@
1726 </literallayout></para></listitem> 1726 </literallayout></para></listitem>
1727 <listitem><para><emphasis>Generate the patch file</emphasis>: 1727 <listitem><para><emphasis>Generate the patch file</emphasis>:
1728 This Git command creates the a patch file named 1728 This Git command creates the a patch file named
1729 <filename>0001-calibrate: Add printk example.patch</filename> 1729 <filename>0001-calibrate-Add-printk-example.patch</filename>
1730 in the current directory. 1730 in the current directory.
1731 <literallayout class='monospaced'> 1731 <literallayout class='monospaced'>
1732 $ git format-patch HEAD~1 1732 $ git format-patch -1
1733 </literallayout> 1733 </literallayout>
1734 </para></listitem> 1734 </para></listitem>
1735 </orderedlist> 1735 </orderedlist>
@@ -1776,7 +1776,7 @@
1776 <literallayout class='monospaced'> 1776 <literallayout class='monospaced'>
1777 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1777 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
1778 1778
1779 SRC_URI += "file://0001-calibrate: Add printk example.patch" 1779 SRC_URI += "file://0001-calibrate-Add-printk-example.patch"
1780 1780
1781 PRINC := "${@int(PRINC) + 1}" 1781 PRINC := "${@int(PRINC) + 1}"
1782 </literallayout> 1782 </literallayout>
@@ -1784,7 +1784,7 @@
1784 statements enable the OpenEmbedded build system to find the patch file. 1784 statements enable the OpenEmbedded build system to find the patch file.
1785 </para></listitem> 1785 </para></listitem>
1786 <listitem><para><emphasis>Put the patch file in your layer</emphasis>: 1786 <listitem><para><emphasis>Put the patch file in your layer</emphasis>:
1787 Move the <filename>0001-calibrate: Add printk example.patch</filename> file to 1787 Move the <filename>0001-calibrate-Add-printk-example.patch</filename> file to
1788 the <filename>meta-mylayer/recipes-kernel/linux/linux-yocto</filename> 1788 the <filename>meta-mylayer/recipes-kernel/linux/linux-yocto</filename>
1789 directory.</para></listitem> 1789 directory.</para></listitem>
1790 </orderedlist> 1790 </orderedlist>