From d691916ef8f1cb9ca71d9b4a9a97bb7de2cc8920 Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Thu, 2 Apr 2015 09:30:41 -0700 Subject: toaster-manual: Review edits applied. Some steps updated according to Belen and a video link fixed to not point to Belen's Youtube area. (From yocto-docs rev: 557c22fdd287160f6aabac0928ce6bd8d6af3394) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- .../toaster-manual/toaster-manual-reference.xml | 4 +- .../toaster-manual-setup-and-use.xml | 79 +++++++++------------- 2 files changed, 34 insertions(+), 49 deletions(-) (limited to 'documentation') diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index cc118643cd..fede4529a2 100644 --- a/documentation/toaster-manual/toaster-manual-reference.xml +++ b/documentation/toaster-manual/toaster-manual-reference.xml @@ -144,7 +144,7 @@
- Select for Use the <filename>toasterconf.json</filename> File + Use the <filename>toasterconf.json</filename> File If you do not want to use the Administration @@ -758,7 +758,7 @@ This area of the JSON file defines the version of BitBake Toaster uses. As shipped, Toaster is configured to recognize four - versions of BitBake: master, dizzy, and HEAD. + versions of BitBake: master, fido, dizzy, and HEAD. HEAD is a special option that builds whatever is available on disk, without checking out any remote diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml index 2a32912e38..a98e3945c6 100644 --- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml +++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml @@ -281,48 +281,35 @@ section. Enable Build Logging to the Common SQL Server for Each Build Directory you are Using: - In the Build Directory, create the required - conf/toaster.conf file by doing - the following: - - The following statements are automatically added - to the toaster.conf file - when Toaster starts through the - toaster start command. - - - - Be sure that Toaster inherits the - toaster - class and it is enabled in Bitbake in order to - record target image package information: - - INHERIT += "toaster" - - - - Enable build history in BitBake. - Build history is needed to record target image - package information: - - INHERIT += "buildhistory" - BUILDHISTORY_COMMIT = "1" - - This last command is not strictly needed. - However, without it build history will not - properly work. - For information on build history, see the - "Maintaining Build Output Quality" - section in the Yocto Project Development - Manual. - - - You also need to point to the database. - You can do this by exporting the - DATABASE_URL variable as follows: + You need to make sure that the + toaster + class and build history are enabled. + This is done in a + toaster.conf file that is + created automatically by the toaster + start command, + and that lives inside the + Build Directory + in /conf/toaster.conf. + That file should include the following line: - export DATABASE_URL=mysql://newuser:password@192.168.0.25:3306/toaster + INHERIT += "toaster buildhistory" + For information on build history, see the + "Maintaining Build Output Quality" + section in the Yocto Project Development + Manual. + You also need to point to the database that you set + up in step 3. + You can do this by exporting the DATABASE_URL + variable as follows: + + export DATABASE_URL=mysql://newuser:password@192.168.0.25:3306/toaster + + This example assumes that you are using + mysql-server. + The IP address should be the IP address of your + database server. Source your Build Environment Setup Script: From your @@ -572,7 +559,7 @@ # Save your changes and exit # Go to Home, Bitbake Versions, Add bitbake version; - # take version infor from : http://git.openembedded.org/bitbake/refs/heads, + # take version information from : http://git.openembedded.org/bitbake/refs/heads, # this manual assumes the master version # set Name: master, Giturl git://git.openembedded.org/bitbake # branch master, dirpath / @@ -816,8 +803,7 @@ http://localhost:8000/toastergui - You can now use the Toaster web interface to do thing - such as track accesses and errors in the Apache + You can track accesses and errors in the Apache service logs. @@ -885,7 +871,7 @@ New Toaster Functionality: This - video + video introduces the new Toaster functionality for this release. Toaster Homepage and Table Controls: @@ -911,8 +897,7 @@ Configuration: This video - shows the information Toaster provides about build - configuration. + provides Toaster build configuration information. Tasks: This @@ -1019,7 +1004,7 @@ - + qYgDZ8YzV6w
-- cgit v1.2.3-54-g00ecf