diff options
Diffstat (limited to 'documentation/toaster-manual/toaster-manual-reference.xml')
| -rw-r--r-- | documentation/toaster-manual/toaster-manual-reference.xml | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index faca4ca73af..ee171dc9b40 100644 --- a/documentation/toaster-manual/toaster-manual-reference.xml +++ b/documentation/toaster-manual/toaster-manual-reference.xml @@ -159,12 +159,13 @@ </para> <para> - When you set up Toaster in Build Mode, you are prompted - to select a Toaster configuration file. + The Toaster startup script in <filename>/bitbake/bin/toaster</filename> specifies + the location of a Toaster configuration file <filename>toasterconf.json</filename> + as the value of the <filename>TOASTER_CONF</filename> variable. This configuration file is used to set up the initial configuration values within the Toaster database including the layer sources. - Three versions of the configuration file exist: + Two versions of the configuration file exist: <itemizedlist> <listitem><para> The first version of the file is found in the @@ -192,14 +193,6 @@ (i.e. <filename>git://git.openembedded.org/openembedded-core</filename>). </para></listitem> - <listitem><para> - The third version is a sample configuration - useful for when you want to set up a hosted - service in Build Mode. - You can find this version on the - <ulink url='https://wiki.yoctoproject.org/wiki/File:Toasterconf.json.txt.patch'>File:Toasterconf.json.txt.patch</ulink> - wiki page. - </para></listitem> </itemizedlist> </para> </section> @@ -550,8 +543,7 @@ <title>JSON Files</title> <para> - If you are going to be using Toaster in Build Mode, it must - be initially configured before use. + Toaster must be configured before use. Configuration customizes layer source settings and Toaster defaults for all users and is performed by the person responsible for Toaster Configuration (i.e the Toaster Administrator). @@ -577,17 +569,16 @@ <filename>toasterconf.json</filename>. The Toaster Administrator can customize the file prior to loading it into Toaster. - When you set up Toaster locally to run in Build Mode, the system - startup script actively looks for compatible configuration files - and prompts you to select a file to load if it detects that the - database has not been configured. + The location of the <filename>toasterconf.json</filename> file is + specified by the <filename>TOASTER_CONF</filename> variable in the + Toaster startup script at <filename>bitbake/bin/toaster</filename>. </para> <section id='json-file-choices'> <title>Configuration File Choices</title> <para> - Three versions of the configuration file exist: + Two versions of the configuration file exist: <itemizedlist> <listitem><para> The @@ -613,15 +604,6 @@ <filename>openembedded-core</filename> repository (i.e. <filename>git://git.openembedded.org/openembedded-core</filename>). </para></listitem> - <listitem><para> - The <filename>Toasterconf.json.txt.patch</filename> - located on the - <ulink url='https://wiki.yoctoproject.org/wiki/File:Toasterconf.json.txt.patch'>File:Toasterconf.json.txt.patch</ulink> - wiki page. - This version of the file is useful as a sample - configuration for when you want to set up Toaster as a - hosted service in Build Mode. - </para></listitem> </itemizedlist> </para> </section> @@ -1008,7 +990,7 @@ <literallayout class='monospaced'> $ bitbake/lib/toaster/manage.py checksettings </literallayout> - In Build Mode, Toaster uses settings that are based on the + Toaster uses settings that are based on the database to configure the building tasks. The <filename>checksettings</filename> command verifies that the database settings are valid in the sense that they have |