From e3a3bdd81fee563d7a703cffae144513c4e8eca0 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Thu, 4 Oct 2012 08:38:11 -0700 Subject: documentation: Makefile, dev-manual - Updated kernel example repo figure Danny, the "kernel-example-repo-.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 Signed-off-by: Richard Purdie --- documentation/Makefile | 26 +++++++++++++++++++-- .../dev-manual/dev-manual-kernel-appendix.xml | 24 +++++++++---------- .../figures/kernel-example-repos-danny.png | Bin 0 -> 25097 bytes .../figures/kernel-example-repos-denzil.png | Bin 34344 -> 0 bytes .../figures/kernel-example-repos-danny.png | Bin 0 -> 25097 bytes .../figures/kernel-example-repos-denzil.png | Bin 34344 -> 0 bytes 6 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 documentation/dev-manual/figures/kernel-example-repos-danny.png delete mode 100644 documentation/dev-manual/figures/kernel-example-repos-denzil.png create mode 100644 documentation/mega-manual/figures/kernel-example-repos-danny.png delete mode 100644 documentation/mega-manual/figures/kernel-example-repos-denzil.png (limited to 'documentation') 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 \ figures/kernel-overview-3-denzil.png \ figures/source-repos.png figures/yp-download.png \ figures/wip.png + else ifeq ($(BRANCH),danny) +TARFILES = dev-style.css dev-manual.html dev-manual.pdf \ + figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ + figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ + figures/kernel-example-repos-danny.png \ + figures/kernel-overview-1.png figures/kernel-overview-2.png \ + figures/kernel-overview-3-denzil.png \ + figures/source-repos.png figures/yp-download.png \ + figures/wip.png else TARFILES = dev-style.css dev-manual.html dev-manual.pdf \ figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ - figures/kernel-example-repos-denzil.png \ + figures/kernel-example-repos-danny.png \ figures/kernel-overview-1.png figures/kernel-overview-2.png \ figures/kernel-overview-3-denzil.png \ figures/source-repos.png figures/yp-download.png \ @@ -176,6 +185,19 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures figures/kernel-overview-3-denzil.png \ figures/source-repos.png figures/yp-download.png \ figures/wip.png + else ifeq ($(BRANCH),danny) +TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures/building-an-image.png \ + figures/using-a-pre-built-image.png \ + figures/poky-title.png \ + figures/adt-title.png figures/bsp-title.png \ + figures/kernel-title.png figures/kernel-architecture-overview.png \ + figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ + figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ + figures/kernel-example-repos-danny.png \ + figures/kernel-overview-1.png figures/kernel-overview-2.png \ + figures/kernel-overview-3-denzil.png \ + figures/source-repos.png figures/yp-download.png \ + figures/wip.png else TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures/building-an-image.png \ figures/using-a-pre-built-image.png \ @@ -184,7 +206,7 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png figures figures/kernel-title.png figures/kernel-architecture-overview.png \ figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \ figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \ - figures/kernel-example-repos-denzil.png \ + figures/kernel-example-repos-danny.png \ figures/kernel-overview-1.png figures/kernel-overview-2.png \ figures/kernel-overview-3-denzil.png \ 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 @@ Briefly, you need the following: A local - source directory for the + Source Directory for the poky Git repository Local copies of the poky-extras - Git repository placed within the source directory. + Git repository placed within the Source Directory. A bare clone of the Yocto Project Kernel upstream Git repository to which you want to push your modifications. @@ -66,7 +66,7 @@ - @@ -76,10 +76,10 @@ Local Source Directory: This area contains all the metadata that supports building images using the OpenEmbedded build system. - In this example, the source directory also + In this example, the Source Directory also contains the build directory, which contains the configuration directory that lets you control the build. - Also in this example, the source directory contains local copies of the + Also in this example, the Source Directory contains local copies of the poky-extras Git repository. See the bulleted item "Yocto Project Release" @@ -132,17 +132,17 @@ Setting Up the Local Source Directory - You can set up the source directory through tarball extraction or by + You can set up the Source Directory through tarball extraction or by cloning the poky Git repository. This example uses poky as the root directory of the - local source directory. + local Source Directory. See the bulleted item "Yocto Project Release" for information on how to get these files. - Once you have source directory set up, + Once you have Source Directory set up, you have many development branches from which you can work. From inside the local repository you can see the branch names and the tag names used in the upstream Git repository by using either of the following commands: @@ -168,7 +168,7 @@ This example creates a local copy of the poky-extras Git - repository inside the poky source directory. + repository inside the poky Source Directory. See the bulleted item "The poky-extras Git Repository" for information on how to set up a local copy of the @@ -530,7 +530,7 @@ If you took the time to work through the example that modifies the kernel source code in "Modifying the Kernel Source - Code" you should already have the source directory set up on your + Code" you should already have the Source Directory set up on your host machine. If this is the case, go to the next section, which is titled "Examining the Default @@ -539,11 +539,11 @@ - If you don't have the source directory established on your system, + If you don't have the Source Directory established on your system, you can get them through tarball extraction or by cloning the poky Git repository. This example uses poky as the root directory of the - source directory. + Source Directory. See the bulleted item "Yocto Project Release" 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 Binary files /dev/null and b/documentation/dev-manual/figures/kernel-example-repos-danny.png 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 Binary files a/documentation/dev-manual/figures/kernel-example-repos-denzil.png and /dev/null 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 Binary files /dev/null and b/documentation/mega-manual/figures/kernel-example-repos-danny.png 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 Binary files a/documentation/mega-manual/figures/kernel-example-repos-denzil.png and /dev/null differ -- cgit v1.2.3-54-g00ecf