diff options
| author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-10-22 09:02:52 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-23 00:03:13 +0100 |
| commit | 450f438012db62362221a792b2a93698f11e62f4 (patch) | |
| tree | ea9e4f3fbabf8bd8f36e7d4171cf741ce99b5255 | |
| parent | 205db48480d5c666d680db301c3b4e03232c46da (diff) | |
| download | ast2050-yocto-poky-450f438012db62362221a792b2a93698f11e62f4.zip ast2050-yocto-poky-450f438012db62362221a792b2a93698f11e62f4.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>
| -rw-r--r-- | documentation/dev-manual/dev-manual-common-tasks.xml | 8 | ||||
| -rw-r--r-- | documentation/dev-manual/dev-manual-model.xml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index df64e11..2f73e28 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml @@ -1726,10 +1726,10 @@ </literallayout></para></listitem> <listitem><para><emphasis>Generate the patch file</emphasis>: This Git command creates the a patch file named - <filename>0001-calibrate: Add printk example.patch</filename> + <filename>0001-calibrate-Add-printk-example.patch</filename> in the current directory. <literallayout class='monospaced'> - $ git format-patch HEAD~1 + $ git format-patch -1 </literallayout> </para></listitem> </orderedlist> @@ -1776,7 +1776,7 @@ <literallayout class='monospaced'> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - SRC_URI += "file://0001-calibrate: Add printk example.patch" + SRC_URI += "file://0001-calibrate-Add-printk-example.patch" PRINC := "${@int(PRINC) + 1}" </literallayout> @@ -1784,7 +1784,7 @@ statements enable the OpenEmbedded build system to find the patch file. </para></listitem> <listitem><para><emphasis>Put the patch file in your layer</emphasis>: - Move the <filename>0001-calibrate: Add printk example.patch</filename> file to + Move the <filename>0001-calibrate-Add-printk-example.patch</filename> file to the <filename>meta-mylayer/recipes-kernel/linux/linux-yocto</filename> directory.</para></listitem> </orderedlist> diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml index 669623b..4452d2a 100644 --- a/documentation/dev-manual/dev-manual-model.xml +++ b/documentation/dev-manual/dev-manual-model.xml @@ -1705,7 +1705,7 @@ directory.</para></listitem> <literallayout class='monospaced'> $ git init $ git add * - $ git commit + $ git commit -m "initial revision" </literallayout> The above Git commands initialize a Git repository that is based on the files in your current working directory, stage all the files, and commit @@ -1762,9 +1762,9 @@ directory.</para></listitem> Once the changes are committed, use the <filename>git format-patch</filename> command to generate a patch file: <literallayout class='monospaced'> - $ git format-patch HEAD~1 + $ git format-patch -1 </literallayout> - The <filename>HEAD~1</filename> part of the command causes Git to generate the + Specifying "-1" causes Git to generate the patch file for the most recent commit.</para> <para>At this point, the patch file has all your edits made to the <filename>file1.c</filename>, <filename>file2.c</filename>, and @@ -1784,7 +1784,7 @@ directory.</para></listitem> of the recipe. Here is an example: <literallayout class='monospaced'> - SRC_URI += "file://my_changes.patch" + SRC_URI += "file://0001-<commit-summary-message>.patch" </literallayout></para></listitem> <listitem><para><emphasis>Increment the Recipe Revision Number:</emphasis> Finally, don't forget to 'bump' the |
