From 70edcf9cf3c3798306803b93fb00270d677af99a Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Wed, 26 Dec 2018 16:07:14 -0800 Subject: mega-manual: Updates to support BitBake User Manual Fixes [YOCTO #12399] Fixes made to have the BitBake User Manual included in the build of the mega-manual. I placed this manual at the end of the mega-manual. Following changes made: * Makefile - Modified to include two PNG files. All PNG files in a given manual are listed in the area that makes the mega-manual so that the tarfile is complete. * mega-manual.xml - Updated the front wording to tell the user that the BitBake User Manual is included in the Mega-Manual. Also, added a last section to actually include the bitbake-title.png file and the *.xml files. Note that I could not add the title figure from the same figures folder of the local "bitbake" folder. Would not include in the build. So, I pulled the file from the figures folder of the mega-manual, which is what I do for all the other book titles used in the mega-manual. * mega-manual.sed - Modified to clean out the old stuff that had been carried along for older books not supported for the release. Modified to include link processing for the newly included BitBake User Manual. * New Figures - Moved copies of the "bb_multiconfig_files.png" and "bitbake-title.png" figures into the figures folder of the mega-manual. (From yocto-docs rev: 78a1ae0ca92bb7f8a9d3a32a320299371d0ed361) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- .../mega-manual/figures/bb_multiconfig_files.png | Bin 0 -> 19991 bytes .../mega-manual/figures/bitbake-title.png | Bin 0 -> 5086 bytes documentation/mega-manual/mega-manual.xml | 32 +++++++++++++++++++-- 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 documentation/mega-manual/figures/bb_multiconfig_files.png create mode 100644 documentation/mega-manual/figures/bitbake-title.png (limited to 'documentation/mega-manual') diff --git a/documentation/mega-manual/figures/bb_multiconfig_files.png b/documentation/mega-manual/figures/bb_multiconfig_files.png new file mode 100644 index 0000000000..041f06403b Binary files /dev/null and b/documentation/mega-manual/figures/bb_multiconfig_files.png differ diff --git a/documentation/mega-manual/figures/bitbake-title.png b/documentation/mega-manual/figures/bitbake-title.png new file mode 100644 index 0000000000..cb290154da Binary files /dev/null and b/documentation/mega-manual/figures/bitbake-title.png differ diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml index 5ea7052f5a..2c518f9511 100644 --- a/documentation/mega-manual/mega-manual.xml +++ b/documentation/mega-manual/mega-manual.xml @@ -12,9 +12,11 @@ The Yocto Project Mega-Manual is a concatenation of the published - Yocto Project HTML manuals for the given release. - The manual exists to help users efficiently search for strings - across the entire Yocto Project documentation set. + Yocto Project HTML manuals along with the corresponding BitBake + User Manual for the given release. + The Mega-Manual exists to help users efficiently search for strings + across the entire Yocto Project documentation set inclusive of + the BitBake User Manual. @@ -322,6 +324,30 @@ + + + + + + + + + + + + + + + + + +