From 0b85ab45df495d9c81a41abed650c833758b09c7 Mon Sep 17 00:00:00 2001 From: Kristi Rifenbark Date: Thu, 28 Sep 2017 16:38:29 -0700 Subject: toaster-manual: Added "Use the Fixture Feature" section Removed two outdated sections, "Use the toasterconf.json File" and "Edit the Configuration File" and replaced them with "Use the Fixture Feature" section. (From yocto-docs rev: 8a247836a958449836effac3600f6923c5289bb6) Signed-off-by: Kristi Rifenbark Signed-off-by: Richard Purdie --- .../toaster-manual/toaster-manual-reference.xml | 185 +++------------------ 1 file changed, 27 insertions(+), 158 deletions(-) (limited to 'documentation') diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index 78febce358..d4cb04e6b0 100644 --- a/documentation/toaster-manual/toaster-manual-reference.xml +++ b/documentation/toaster-manual/toaster-manual-reference.xml @@ -148,177 +148,46 @@ -
- Use the <filename>toasterconf.json</filename> File +
+ Use the Fixture Feature - If you do not want to use the Administration - Interface, you can edit the - toasterconf.json - file and reload it to Toaster. - - - - The Toaster startup script in - /bitbake/bin/toaster specifies - the location of a Toaster configuration file - toasterconf.json as the value of - the TOASTER_CONF variable. - This configuration file is used to set up the initial - configuration values within the Toaster database - including the layer sources. - Two versions of the configuration file exist: - - - The first version of the file is found in the - conf directory of the - meta-poky layer - (i.e. - meta-poky/conf/toasterconf.json). - This version contains the default Yocto Project - configuration for Toaster. - - - The second version of the file is in the - conf directory of the - openembedded-core layer - (i.e. meta/conf/toasterconf.json). - This version contains the default OpenEmbedded - configuration for Toaster. - - - -
- -
- Edit the Configuration File - - - Edit the version of the - toasterconf.json file you - used to set up your Toaster instance. - In the file, you will find a section for layer sources - such as the following: + The Django fixture feature overrides the default layer + server when you use it to specify a custom URL. To use + the fixture feature, create (or edit) the file + bitbake/lib/toaster.orm/fixtures/custom.xml, + and then set the following Toaster setting to your + custom URL: - "layersources": [ - { - "name": "Local Yocto Project", - "sourcetype": "local", - "apiurl": "../../", - "branches": ["HEAD" ], - "layers": [ - { - "name": "openembedded-core", - "local_path": "meta", - "vcs_url": "remote:origin", - "dirpath": "meta" - }, - { - "name": "meta-poky", - "local_path": "meta-poky", - "vcs_url": "remote:origin", - "dirpath": "meta-poky" - }, - { - "name": "meta-yocto-bsp", - "local_path": "meta-yocto-bsp", - "vcs_url": "remote:origin", - "dirpath": "meta-yocto-bsp" - } - - ] - }, - { - "name": "OpenEmbedded", - "sourcetype": "layerindex", - "apiurl": "http://layers.openembedded.org/layerindex/api/", - "branches": ["master", "jethro" ,"fido"] - }, - { - "name": "Imported layers", - "sourcetype": "imported", - "apiurl": "", - "branches": ["master", "jethro","fido", "HEAD"] - - } - ], + <?xml version="1.0" ?> + <django-objects version="1.0"> + <object model="orm.toastersetting" pk="100"> + <field name="name" type="CharField">CUSTOM_LAYERINDEX_SERVER</field> + <field name="value" type="CharField">https://layers.my_organization.org/layerindex/branch/master/layers/</field> + </object> + <django-objects> - You should add your own layer source to this section by - following the same format used for the "OpenEmbedded" - layer source shown above. + When you start Toaster for the first time, or if you + delete the file toaster.sqlite and restart, + the database will populate from this layer index server. - Give your layer source a name, provide the URL of your - layer source API, use the source type "layerindex", and - indicate which branches from your layer source you want - to make available through Toaster. - For example, the OpenEmbedded layer source makes - available only its "master", "fido", and "jethro" - branches. - - - - The branches must match the branch you - set when configuring your releases. - For example, if you configure one release in Toaster - by setting its branch to "branch-one" and you configure - another release in Toaster by setting its branch to - "branch-two", the branches in your layer source should - be "branch-one" and "branch-two" as well. - Doing so creates a connection between the releases - and the layer information from your layer source. - Thus, when users create a project with a given - release, they will see the appropriate layers from - your layer source. - This connection ensures that only layers that are - compatible with the selected project release can be - selected for building. - - - - Once you have added this information to the - toasterconf.json file, save your - changes. + Once the information has been updated, verify the new layer + information is available by using the Toaster web interface. + To do that, visit the "All compatible layers" page inside a + Toaster project. The layers from your layer source should be + listed there. - In a terminal window, navigate to the directory that - contains the Toaster database, which by default is the - root of the Yocto Project - Source Directory. - Once you are located in that directory, run the - "loadconf" command, which takes as - an argument the full path to the - toasterconf.json file you just edited. - For example, if you cloned the - poky repository and you edited the - meta-poky/conf/toasterconf.json file, - you would type something like the following: - - $ bitbake/lib/toaster/manage.py loadconf /home/scottrif/poky/meta-poky/conf/toasterconf.json - - After entering this command, you need to update the - Toaster database with the information coming from your - new layer source. - To do that, you should run the - "lsupdates" command from the directory - that contains the Toaster database. - Here is an example: + If you change the information in your layer index server, + refresh the Toaster database by running the following command: $ bitbake/lib/toaster/manage.py lsupdates If Toaster can reach the API URL, you should see a message - telling you that Toaster is updating the layer source - information. - - - - Once the information has been updated, verify the new layer - information is available by using the Toaster web interface. - To do that, visit the "All compatible layers" page inside a - Toaster project. - The layers from your layer source should be listed there. + telling you that Toaster is updating the layer source information.
@@ -364,7 +233,7 @@ This release causes your Toaster projects to build against the head of the &DISTRO_NAME_NO_CAP; branch at - or . + or . Yocto Project "Master" or OpenEmbedded "Master": This release causes your Toaster Projects to -- cgit v1.2.3-54-g00ecf