diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2013-01-14 12:24:08 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-16 15:59:21 +0000 |
commit | b43b8efcffcbeedfebbc154c40c8c0047a7941c0 (patch) | |
tree | 8309e78feb3258a7715c7441b4a96a80eff5bc0e /documentation/kernel-dev | |
parent | 29d5511d026f365b2db68b8e87a487515d82cc69 (diff) | |
download | poky-b43b8efcffcbeedfebbc154c40c8c0047a7941c0.tar.gz |
kernel-dev: Edits to the SCC reference section.
(From yocto-docs rev: 51872ec247e93f9dd7b7c12ee32191565c30ebfa)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/kernel-dev')
-rw-r--r-- | documentation/kernel-dev/kernel-dev-advanced.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/documentation/kernel-dev/kernel-dev-advanced.xml b/documentation/kernel-dev/kernel-dev-advanced.xml index df3f30141a..43dec92555 100644 --- a/documentation/kernel-dev/kernel-dev-advanced.xml +++ b/documentation/kernel-dev/kernel-dev-advanced.xml | |||
@@ -1034,11 +1034,11 @@ | |||
1034 | </section> | 1034 | </section> |
1035 | 1035 | ||
1036 | <section id='scc-reference'> | 1036 | <section id='scc-reference'> |
1037 | <title>SCC Reference</title> | 1037 | <title>SCC Description File Reference</title> |
1038 | 1038 | ||
1039 | <para> | 1039 | <para> |
1040 | This section provides short descriptions for the commands you can | 1040 | This section provides a brief reference for the commands you can use |
1041 | use from an <filename>.scc</filename>: | 1041 | within an SCC description file (<filename>.scc</filename>): |
1042 | <itemizedlist> | 1042 | <itemizedlist> |
1043 | <listitem><para><filename>branch [ref]</filename>: | 1043 | <listitem><para><filename>branch [ref]</filename>: |
1044 | Creates a new branch relative to the current branch | 1044 | Creates a new branch relative to the current branch |
@@ -1051,13 +1051,15 @@ | |||
1051 | <filename>KTYPE</filename>, <filename>KARCH</filename>, | 1051 | <filename>KTYPE</filename>, <filename>KARCH</filename>, |
1052 | and <filename>KFEATURE_DESCRIPTION</filename>.</para></listitem> | 1052 | and <filename>KFEATURE_DESCRIPTION</filename>.</para></listitem> |
1053 | <listitem><para><filename>include SCC_FILE</filename>: | 1053 | <listitem><para><filename>include SCC_FILE</filename>: |
1054 | Includes an <filename>scc</filename> file in the current file. | 1054 | Includes an SCC file in the current file. |
1055 | It will be parsed as if inserted inline.</para></listitem> | 1055 | The file is parsed as if you had inserted it inline. |
1056 | </para></listitem> | ||
1056 | <listitem><para><filename>kconf [hardware|non-hardware] CFG_FILE</filename>: | 1057 | <listitem><para><filename>kconf [hardware|non-hardware] CFG_FILE</filename>: |
1057 | Queues a configuration fragment for merging into the final | 1058 | Queues a configuration fragment for merging into the final |
1058 | Linux <filename>.config</filename> file.</para></listitem> | 1059 | Linux <filename>.config</filename> file.</para></listitem> |
1059 | <listitem><para><filename>git merge GIT_BRANCH</filename>: | 1060 | <listitem><para><filename>git merge GIT_BRANCH</filename>: |
1060 | Merges the feature branch into the current branch.</para></listitem> | 1061 | Merges the feature branch into the current branch. |
1062 | </para></listitem> | ||
1061 | <listitem><para><filename>patch PATCH_FILE</filename>: | 1063 | <listitem><para><filename>patch PATCH_FILE</filename>: |
1062 | Applies the patch to the current Git branch.</para></listitem> | 1064 | Applies the patch to the current Git branch.</para></listitem> |
1063 | </itemizedlist> | 1065 | </itemizedlist> |