diff options
| author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2011-02-08 13:48:13 -0600 |
|---|---|---|
| committer | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2011-02-14 17:07:35 -0600 |
| commit | 09e2aac993621fb1eaca8d1f7d150139472f7dae (patch) | |
| tree | 939f27a11d5ca0fe27534cc0aff38f6203170f9f | |
| parent | 2a8c4a32be789e4101b24b0d9ea6d8116968fc72 (diff) | |
| download | poky-09e2aac993621fb1eaca8d1f7d150139472f7dae.tar.gz | |
documentation/kernel-manual/kernel-how-to.xml: - Condense and merge example changed.
The example used to show how to condense and merge two BSPs into a second
SCM used a non-existant machine (cav_ebt5800-standard). I replaced this
machine with 'common_pc_64-standard, which is a real machine.
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
| -rw-r--r-- | documentation/kernel-manual/kernel-how-to.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml index 6b326b5561..01a78e685c 100644 --- a/documentation/kernel-manual/kernel-how-to.xml +++ b/documentation/kernel-manual/kernel-how-to.xml | |||
| @@ -882,7 +882,7 @@ repository. | |||
| 882 | The following commands illustrate how you can condense and merge two BSPs into a second SCM: | 882 | The following commands illustrate how you can condense and merge two BSPs into a second SCM: |
| 883 | <literallayout class='monospaced'> | 883 | <literallayout class='monospaced'> |
| 884 | > git checkout common_pc-standard | 884 | > git checkout common_pc-standard |
| 885 | > git merge cav_ebt5800-standard | 885 | > git merge common_pc_64-standard |
| 886 | # resolve any conflicts and commit them | 886 | # resolve any conflicts and commit them |
| 887 | > cd .. ; echo linux/.git > .cvsignore | 887 | > cd .. ; echo linux/.git > .cvsignore |
| 888 | > cvs import -m "initial import" linux MY_COMPANY start | 888 | > cvs import -m "initial import" linux MY_COMPANY start |