summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2012-04-26 14:46:36 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-01 20:00:30 (GMT)
commitcaf6532b519cfbd715fee40ca79e68659e0ce5de (patch)
tree0c0c2af9b36fa2d2462f10af0f2703993135f0e5 /documentation
parenta81cb954bb9e416557c2fddae8f09ddf4aef7959 (diff)
downloadpoky-caf6532b519cfbd715fee40ca79e68659e0ce5de.tar.gz
documentation: release-specific figure needed for denzil in dev-manual
dev-manual/dev-manual-model.xml: The Bare Clone and Copy of the Bare Clone figures are out of date for denzil. These needed to be re-done so they use "linux-yocto-3.2.git" and "my-linux-yocto-3.0-work" as the root names. This presents a Makefile issue when making the denzil and pre-denzil versions of the manuals. Whenever you use a different figure for a different release, you need to involve the BRANCH variable in the Makefile. This is necessary because you are using different figures in the generated tarballs. The set of figures could be unique to the release. The outdated figure is "kernel-overview-3.png" and will eventually be removed (later commit). I created a new figure named "kernel-overview-3-denzil.png" and used that in the dev-manual-model.xml file. documentation/Makefile: I updated the Makefile to test for a "denzil" release build and if so include the new file in the generated tarball. This commit adds the new .PNG file as well. Fixed the Makefile so that if you don't supply a BRANCH value, it uses the latest figures (denzil). (From yocto-docs rev: 49552b12a967f97eb4d75477895bf32f61d69aa6) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/Makefile16
-rw-r--r--documentation/dev-manual/dev-manual-model.xml2
-rw-r--r--documentation/dev-manual/figures/kernel-overview-3-denzil.pngbin0 -> 42285 bytes
3 files changed, 14 insertions, 4 deletions
diff --git a/documentation/Makefile b/documentation/Makefile
index 7cf1c67..3a12c0e 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -82,7 +82,8 @@ ALLPREQ = html pdf tarball
82# 82#
83# Note that the tarfile might produce the "Cannot stat: No such file or directory" error 83# Note that the tarfile might produce the "Cannot stat: No such file or directory" error
84# message for .PNG files that are not present when building a particular branch. The 84# message for .PNG files that are not present when building a particular branch. The
85# list of files is all-inclusive for all branches. 85# list of files is all-inclusive for all branches. Note, if you don't provide a BRANCH
86# option, it defaults to the latest stuff. This would be appropriate for "master" branch.
86# 87#
87 88
88 ifeq ($(BRANCH),edison) 89 ifeq ($(BRANCH),edison)
@@ -94,13 +95,22 @@ TARFILES = style.css dev-manual.html dev-manual.pdf \
94 figures/kernel-overview-3-edison.png \ 95 figures/kernel-overview-3-edison.png \
95 figures/source-repos.png figures/yp-download.png \ 96 figures/source-repos.png figures/yp-download.png \
96 figures/wip.png 97 figures/wip.png
97 else 98 else ifeq ($(BRANCH),denzil)
98TARFILES = style.css dev-manual.html dev-manual.pdf \ 99TARFILES = style.css dev-manual.html dev-manual.pdf \
99 figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ 100 figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \
100 figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ 101 figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \
101 figures/kernel-example-repos.png \ 102 figures/kernel-example-repos.png \
102 figures/kernel-overview-1.png figures/kernel-overview-2.png \ 103 figures/kernel-overview-1.png figures/kernel-overview-2.png \
103 figures/kernel-overview-3.png \ 104 figures/kernel-overview-3-denzil.png \
105 figures/source-repos.png figures/yp-download.png \
106 figures/wip.png
107 else
108TARFILES = style.css dev-manual.html dev-manual.pdf \
109 figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \
110 figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \
111 figures/kernel-example-repos.png \
112 figures/kernel-overview-1.png figures/kernel-overview-2.png \
113 figures/kernel-overview-3-denzil.png \
104 figures/source-repos.png figures/yp-download.png \ 114 figures/source-repos.png figures/yp-download.png \
105 figures/wip.png 115 figures/wip.png
106 endif 116 endif
diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 9329397..be854b9 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -336,7 +336,7 @@
336 </para> 336 </para>
337 337
338 <para> 338 <para>
339 <imagedata fileref="figures/kernel-overview-3.png" 339 <imagedata fileref="figures/kernel-overview-3-denzil.png"
340 width="6in" depth="4in" align="center" scale="100" /> 340 width="6in" depth="4in" align="center" scale="100" />
341 </para> 341 </para>
342 342
diff --git a/documentation/dev-manual/figures/kernel-overview-3-denzil.png b/documentation/dev-manual/figures/kernel-overview-3-denzil.png
new file mode 100644
index 0000000..5f2ea05
--- /dev/null
+++ b/documentation/dev-manual/figures/kernel-overview-3-denzil.png
Binary files differ