diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2012-10-04 08:38:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-07 13:15:35 +0100 |
commit | 4364f11ae332cfbc1ed48e9c8b4fd3f26c732b7b (patch) | |
tree | b041c975a2c7632318d27eab699f6b6a0cfc4822 | |
parent | 502b0166ae414aac9e6aef0bc2e213e38236666e (diff) | |
download | poky-4364f11ae332cfbc1ed48e9c8b4fd3f26c732b7b.tar.gz |
documentation: Makefile, dev-manual - Updated kernel example repo figure
Danny, the "kernel-example-repo-<release>.png" file changed to
"kernel-example-repo-danny.png". To correctly make the dev-manual
and the mega-manual some things needed to change:
1. New figure created and added to both the dev-manual and the
mega-manuals figures directory.
2. The "kernel-example-repo-denzil.png" files from the dev-manual
and mega-manual figures directory was removed.
3. The Makefile was adjusted so a new BRANCH=danny area now exists
to set TARFILES for both dev-manual and mega-manual.
(From yocto-docs rev: 8b2ff6b657a1486559799e219baaec9fde2e5c6c)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/Makefile | 26 | ||||
-rw-r--r-- | documentation/dev-manual/dev-manual-kernel-appendix.xml | 24 | ||||
-rw-r--r-- | documentation/dev-manual/figures/kernel-example-repos-danny.png | bin | 0 -> 25097 bytes | |||
-rw-r--r-- | documentation/dev-manual/figures/kernel-example-repos-denzil.png | bin | 34344 -> 0 bytes | |||
-rw-r--r-- | documentation/mega-manual/figures/kernel-example-repos-danny.png | bin | 0 -> 25097 bytes | |||
-rw-r--r-- | documentation/mega-manual/figures/kernel-example-repos-denzil.png | bin | 34344 -> 0 bytes |
6 files changed, 36 insertions, 14 deletions
diff --git a/documentation/Makefile b/documentation/Makefile index ee7089aee6..33fcd7a511 100644 --- a/documentation/Makefile +++ b/documentation/Makefile | |||
@@ -115,11 +115,20 @@ TARFILES = dev-style.css dev-manual.html dev-manual.pdf \ | |||
115 | figures/kernel-overview-3-denzil.png \ | 115 | figures/kernel-overview-3-denzil.png \ |
116 | figures/source-repos.png figures/yp-download.png \ | 116 | figures/source-repos.png figures/yp-download.png \ |
117 | figures/wip.png | 117 | figures/wip.png |
118 | else ifeq ($(BRANCH),danny) | ||
119 | TARFILES = dev-style.css dev-manual.html dev-manual.pdf \ | ||
120 | figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ | ||
121 | figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ | ||
122 | figures/kernel-example-repos-danny.png \ | ||
123 | figures/kernel-overview-1.png figures/kernel-overview-2.png \ | ||
124 | figures/kernel-overview-3-denzil.png \ | ||
125 | figures/source-repos.png figures/yp-download.png \ | ||
126 | figures/wip.png | ||
118 | else | 127 | else |
119 | TARFILES = dev-style.css dev-manual.html dev-manual.pdf \ | 128 | TARFILES = dev-style.css dev-manual.html dev-manual.pdf \ |
120 | figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ | 129 | figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ |
121 | figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ | 130 | figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ |
122 | figures/kernel-example-repos-denzil.png \ | 131 | figures/kernel-example-repos-danny.png \ |
123 | figures/kernel-overview-1.png figures/kernel-overview-2.png \ | 132 | figures/kernel-overview-1.png figures/kernel-overview-2.png \ |
124 | figures/kernel-overview-3-denzil.png \ | 133 | figures/kernel-overview-3-denzil.png \ |
125 | figures/source-repos.png figures/yp-download.png \ | 134 | figures/source-repos.png figures/yp-download.png \ |
@@ -176,6 +185,19 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures | |||
176 | figures/kernel-overview-3-denzil.png \ | 185 | figures/kernel-overview-3-denzil.png \ |
177 | figures/source-repos.png figures/yp-download.png \ | 186 | figures/source-repos.png figures/yp-download.png \ |
178 | figures/wip.png | 187 | figures/wip.png |
188 | else ifeq ($(BRANCH),danny) | ||
189 | TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures/building-an-image.png \ | ||
190 | figures/using-a-pre-built-image.png \ | ||
191 | figures/poky-title.png \ | ||
192 | figures/adt-title.png figures/bsp-title.png \ | ||
193 | figures/kernel-title.png figures/kernel-architecture-overview.png \ | ||
194 | figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ | ||
195 | figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ | ||
196 | figures/kernel-example-repos-danny.png \ | ||
197 | figures/kernel-overview-1.png figures/kernel-overview-2.png \ | ||
198 | figures/kernel-overview-3-denzil.png \ | ||
199 | figures/source-repos.png figures/yp-download.png \ | ||
200 | figures/wip.png | ||
179 | else | 201 | else |
180 | TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures/building-an-image.png \ | 202 | TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures/building-an-image.png \ |
181 | figures/using-a-pre-built-image.png \ | 203 | figures/using-a-pre-built-image.png \ |
@@ -184,7 +206,7 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures | |||
184 | figures/kernel-title.png figures/kernel-architecture-overview.png \ | 206 | figures/kernel-title.png figures/kernel-architecture-overview.png \ |
185 | figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ | 207 | figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ |
186 | figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ | 208 | figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ |
187 | figures/kernel-example-repos-denzil.png \ | 209 | figures/kernel-example-repos-danny.png \ |
188 | figures/kernel-overview-1.png figures/kernel-overview-2.png \ | 210 | figures/kernel-overview-1.png figures/kernel-overview-2.png \ |
189 | figures/kernel-overview-3-denzil.png \ | 211 | figures/kernel-overview-3-denzil.png \ |
190 | figures/source-repos.png figures/yp-download.png \ | 212 | figures/source-repos.png figures/yp-download.png \ |
diff --git a/documentation/dev-manual/dev-manual-kernel-appendix.xml b/documentation/dev-manual/dev-manual-kernel-appendix.xml index 3a65df1d3b..62410c90f5 100644 --- a/documentation/dev-manual/dev-manual-kernel-appendix.xml +++ b/documentation/dev-manual/dev-manual-kernel-appendix.xml | |||
@@ -41,11 +41,11 @@ | |||
41 | Briefly, you need the following: | 41 | Briefly, you need the following: |
42 | <itemizedlist> | 42 | <itemizedlist> |
43 | <listitem><para>A local | 43 | <listitem><para>A local |
44 | <link linkend='source-directory'>source directory</link> for the | 44 | <link linkend='source-directory'>Source Directory</link> for the |
45 | poky Git repository</para></listitem> | 45 | poky Git repository</para></listitem> |
46 | <listitem><para>Local copies of the | 46 | <listitem><para>Local copies of the |
47 | <link linkend='poky-extras-repo'><filename>poky-extras</filename></link> | 47 | <link linkend='poky-extras-repo'><filename>poky-extras</filename></link> |
48 | Git repository placed within the source directory.</para></listitem> | 48 | Git repository placed within the Source Directory.</para></listitem> |
49 | <listitem><para>A bare clone of the | 49 | <listitem><para>A bare clone of the |
50 | <link linkend='local-kernel-files'>Yocto Project Kernel</link> upstream Git | 50 | <link linkend='local-kernel-files'>Yocto Project Kernel</link> upstream Git |
51 | repository to which you want to push your modifications. | 51 | repository to which you want to push your modifications. |
@@ -66,7 +66,7 @@ | |||
66 | </para> | 66 | </para> |
67 | 67 | ||
68 | <para> | 68 | <para> |
69 | <imagedata fileref="figures/kernel-example-repos-denzil.png" width="7in" depth="5in" | 69 | <imagedata fileref="figures/kernel-example-repos-danny.png" width="7in" depth="5in" |
70 | align="center" scale="100" /> | 70 | align="center" scale="100" /> |
71 | </para> | 71 | </para> |
72 | 72 | ||
@@ -76,10 +76,10 @@ | |||
76 | <listitem><para><emphasis>Local Source Directory:</emphasis> | 76 | <listitem><para><emphasis>Local Source Directory:</emphasis> |
77 | This area contains all the metadata that supports building images | 77 | This area contains all the metadata that supports building images |
78 | using the OpenEmbedded build system. | 78 | using the OpenEmbedded build system. |
79 | In this example, the source directory also | 79 | In this example, the Source Directory also |
80 | contains the build directory, which contains the configuration directory | 80 | contains the build directory, which contains the configuration directory |
81 | that lets you control the build. | 81 | that lets you control the build. |
82 | Also in this example, the source directory contains local copies of the | 82 | Also in this example, the Source Directory contains local copies of the |
83 | <filename>poky-extras</filename> Git repository.</para> | 83 | <filename>poky-extras</filename> Git repository.</para> |
84 | <para>See the bulleted item | 84 | <para>See the bulleted item |
85 | "<link linkend='local-yp-release'>Yocto Project Release</link>" | 85 | "<link linkend='local-yp-release'>Yocto Project Release</link>" |
@@ -132,17 +132,17 @@ | |||
132 | <title>Setting Up the Local Source Directory</title> | 132 | <title>Setting Up the Local Source Directory</title> |
133 | 133 | ||
134 | <para> | 134 | <para> |
135 | You can set up the source directory through tarball extraction or by | 135 | You can set up the Source Directory through tarball extraction or by |
136 | cloning the <filename>poky</filename> Git repository. | 136 | cloning the <filename>poky</filename> Git repository. |
137 | This example uses <filename>poky</filename> as the root directory of the | 137 | This example uses <filename>poky</filename> as the root directory of the |
138 | local source directory. | 138 | local Source Directory. |
139 | See the bulleted item | 139 | See the bulleted item |
140 | "<link linkend='local-yp-release'>Yocto Project Release</link>" | 140 | "<link linkend='local-yp-release'>Yocto Project Release</link>" |
141 | for information on how to get these files. | 141 | for information on how to get these files. |
142 | </para> | 142 | </para> |
143 | 143 | ||
144 | <para> | 144 | <para> |
145 | Once you have source directory set up, | 145 | Once you have Source Directory set up, |
146 | you have many development branches from which you can work. | 146 | you have many development branches from which you can work. |
147 | From inside the local repository you can see the branch names and the tag names used | 147 | From inside the local repository you can see the branch names and the tag names used |
148 | in the upstream Git repository by using either of the following commands: | 148 | in the upstream Git repository by using either of the following commands: |
@@ -168,7 +168,7 @@ | |||
168 | 168 | ||
169 | <para> | 169 | <para> |
170 | This example creates a local copy of the <filename>poky-extras</filename> Git | 170 | This example creates a local copy of the <filename>poky-extras</filename> Git |
171 | repository inside the <filename>poky</filename> source directory. | 171 | repository inside the <filename>poky</filename> Source Directory. |
172 | See the bulleted item "<link linkend='poky-extras-repo'>The | 172 | See the bulleted item "<link linkend='poky-extras-repo'>The |
173 | <filename>poky-extras</filename> Git Repository</link>" | 173 | <filename>poky-extras</filename> Git Repository</link>" |
174 | for information on how to set up a local copy of the | 174 | for information on how to set up a local copy of the |
@@ -530,7 +530,7 @@ | |||
530 | <para> | 530 | <para> |
531 | If you took the time to work through the example that modifies the kernel source code | 531 | If you took the time to work through the example that modifies the kernel source code |
532 | in "<link linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source | 532 | in "<link linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source |
533 | Code</link>" you should already have the source directory set up on your | 533 | Code</link>" you should already have the Source Directory set up on your |
534 | host machine. | 534 | host machine. |
535 | If this is the case, go to the next section, which is titled | 535 | If this is the case, go to the next section, which is titled |
536 | "<link linkend='examining-the-default-config-smp-behavior'>Examining the Default | 536 | "<link linkend='examining-the-default-config-smp-behavior'>Examining the Default |
@@ -539,11 +539,11 @@ | |||
539 | </para> | 539 | </para> |
540 | 540 | ||
541 | <para> | 541 | <para> |
542 | If you don't have the source directory established on your system, | 542 | If you don't have the Source Directory established on your system, |
543 | you can get them through tarball extraction or by | 543 | you can get them through tarball extraction or by |
544 | cloning the <filename>poky</filename> Git repository. | 544 | cloning the <filename>poky</filename> Git repository. |
545 | This example uses <filename>poky</filename> as the root directory of the | 545 | This example uses <filename>poky</filename> as the root directory of the |
546 | <link linkend='source-directory'>source directory</link>. | 546 | <link linkend='source-directory'>Source Directory</link>. |
547 | See the bulleted item | 547 | See the bulleted item |
548 | "<link linkend='local-yp-release'>Yocto Project Release</link>" | 548 | "<link linkend='local-yp-release'>Yocto Project Release</link>" |
549 | for information on how to get these files. | 549 | for information on how to get these files. |
diff --git a/documentation/dev-manual/figures/kernel-example-repos-danny.png b/documentation/dev-manual/figures/kernel-example-repos-danny.png new file mode 100644 index 0000000000..01cf47ccb8 --- /dev/null +++ b/documentation/dev-manual/figures/kernel-example-repos-danny.png | |||
Binary files differ | |||
diff --git a/documentation/dev-manual/figures/kernel-example-repos-denzil.png b/documentation/dev-manual/figures/kernel-example-repos-denzil.png deleted file mode 100644 index 79fc60698b..0000000000 --- a/documentation/dev-manual/figures/kernel-example-repos-denzil.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/documentation/mega-manual/figures/kernel-example-repos-danny.png b/documentation/mega-manual/figures/kernel-example-repos-danny.png new file mode 100644 index 0000000000..01cf47ccb8 --- /dev/null +++ b/documentation/mega-manual/figures/kernel-example-repos-danny.png | |||
Binary files differ | |||
diff --git a/documentation/mega-manual/figures/kernel-example-repos-denzil.png b/documentation/mega-manual/figures/kernel-example-repos-denzil.png deleted file mode 100644 index 79fc60698b..0000000000 --- a/documentation/mega-manual/figures/kernel-example-repos-denzil.png +++ /dev/null | |||
Binary files differ | |||