diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2015-11-04 10:19:12 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-18 16:44:02 +0000 |
commit | e3425d4b0d285a71b061dcea1e0b084033054e4f (patch) | |
tree | 3a504508b5712513f77afa499feffc0b3ec0aaa5 | |
parent | 5752ef3892d02dc47e226bfb01eabdf7400f748b (diff) | |
download | ast2050-yocto-poky-e3425d4b0d285a71b061dcea1e0b084033054e4f.zip ast2050-yocto-poky-e3425d4b0d285a71b061dcea1e0b084033054e4f.tar.gz |
toaster-manual: Updated to remove 'master' as the default branch
Made several changes as Toaster will not support using the
'master' branch now.
(From yocto-docs rev: cc7e1273944d72388ba4202cbf7146a909d1cdac)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/toaster-manual/toaster-manual-reference.xml | 68 | ||||
-rw-r--r-- | documentation/toaster-manual/toaster-manual-setup-and-use.xml | 21 |
2 files changed, 33 insertions, 56 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index 0c9401f..381e4c3 100644 --- a/documentation/toaster-manual/toaster-manual-reference.xml +++ b/documentation/toaster-manual/toaster-manual-reference.xml @@ -219,7 +219,7 @@ "name": "Local Yocto Project", "sourcetype": "local", "apiurl": "../../", - "branches": ["HEAD", "master", "fido", "dizzy"], + "branches": ["HEAD", "fido", "dizzy"], "layers": [ { "name": "openembedded-core", @@ -246,13 +246,13 @@ "name": "OpenEmbedded", "sourcetype": "layerindex", "apiurl": "http://layers.openembedded.org/layerindex/api/", - "branches": ["master", "fido", "dizzy"] + "branches": ["fido", "dizzy"] }, { "name": "Imported layers", "sourcetype": "imported", "apiurl": "", - "branches": ["master", "fido", "dizzy", "HEAD"] + "branches": ["fido", "dizzy", "HEAD"] } ], @@ -268,8 +268,7 @@ 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 "dizzy" - branches. + available only its "fido" and "dizzy" branches. </para> <para> @@ -387,14 +386,6 @@ or <ulink url='http://git.openembedded.org/openembedded-core/commit/?h=fido'></ulink>. </para></listitem> - <listitem><para><emphasis>Yocto Project "Master" or OpenEmbedded "Master":</emphasis> - This release causes your Toaster Projects to - build against the head of the master branch, which is - where active development takes place, at - <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/log/'></ulink> - or - <ulink url='http://git.openembedded.org/openembedded-core/log/'></ulink>. - </para></listitem> <listitem><para><emphasis>Local Yocto Project or Local OpenEmbedded:</emphasis> This release causes your Toaster Projects to build against the head of the <filename>poky</filename> @@ -441,14 +432,14 @@ Git repository. As an example, consider the following snippet from a Toaster JSON configuration file. - This BitBake version uses the master branch from the + This BitBake version uses the fido branch from the OpenEmbedded repository: <literallayout class='monospaced'> "bitbake" : [ { - "name": "master", + "name": "fido", "giturl": "git://git.openembedded.org/bitbake", - "branch": "master", + "branch": "1.26", "dirpath": "" } ] @@ -489,7 +480,7 @@ The branch for the layer source (<filename>branch</filename>) used with the release. For example, for the OpenEmbedded layer source, the - "master", "fido", and "dizzy" branches are available. + "fido" and "dizzy" branches are available. </para></listitem> <listitem><para><emphasis>Default Layers:</emphasis> The set of default layers @@ -522,8 +513,8 @@ <para> To summarize what comprises a release, consider the following example from a Toaster JSON file. - The configuration names the release "master" and uses the - "master" branch provided by the layer source of type + The configuration names the release "fido" and uses the + "fido" branch provided by the layer source of type "layerindex", which is called "OpenEmbedded", and sets the <filename>openembedded-core</filename> layer as the one to be added by default to any projects created in Toaster. @@ -532,13 +523,13 @@ <literallayout class='monospaced'> "releases": [ { - "name": "master", - "description": "OpenEmbedded master", - "bitbake": "master", - "branch": "master", + "name": "fido", + "description": "OpenEmbedded fido", + "bitbake": "fido", + "branch": "fido", "defaultlayers": [ "openembedded-core" ], "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, - "helptext": "Toaster will run your builds using the OpenEmbedded master branch, where active development takes place. This is not a stable branch, so your builds might not work as expected." + "helptext": "Toaster will run your builds using the OpenEmbedded fido branch." } ] </literallayout> @@ -715,7 +706,7 @@ "name": "Local Yocto Project", "sourcetype": "local", "apiurl": "../../", - "branches": ["HEAD", "master", "fido", "dizzy"], + "branches": ["HEAD", "fido", "dizzy"], "layers": [ { "name": "openembedded-core", @@ -742,13 +733,13 @@ "name": "OpenEmbedded", "sourcetype": "layerindex", "apiurl": "http://layers.openembedded.org/layerindex/api/", - "branches": ["master", "fido", "dizzy"] + "branches": ["fido", "dizzy"] }, { "name": "Imported layers", "sourcetype": "imported", "apiurl": "", - "branches": ["master", "fido", "dizzy", "HEAD"] + "branches": ["fido", "dizzy", "HEAD"] } ], @@ -762,8 +753,8 @@ <para> 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, fido, dizzy, and HEAD. + As shipped, Toaster is configured to recognize three + versions of BitBake: fido, dizzy, and HEAD. <note> HEAD is a special option that builds whatever is available on disk, without checking out any remote @@ -776,12 +767,6 @@ <literallayout class='monospaced'> "bitbake" : [ { - "name": "master", - "giturl": "remote:origin", - "branch": "master", - "dirpath": "bitbake" - }, - { "name": "fido", "giturl": "remote:origin", "branch": "fido", @@ -810,14 +795,14 @@ <para> This area of the JSON file establishes a default release used by Toaster. - As shipped, Toaster uses the "master" release. + As shipped, Toaster uses the "fido" release. </para> <para> Here is the statement in the JSON file that establishes the default release: <literallayout class='monospaced'> - "defaultrelease": "master", + "defaultrelease": "fido", </literallayout> </para> </section> @@ -839,15 +824,6 @@ <literallayout class='monospaced'> "releases": [ { - "name": "master", - "description": "Yocto Project master", - "bitbake": "master", - "branch": "master", - "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], - "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, - "helptext": "Toaster will run your builds using the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\">Yocto Project master branch</a>, where active development takes place. This is not a stable branch, so your builds might not work as expected." - }, - { "name": "fido", "description": "Yocto Project 1.8 Fido", "bitbake": "fido", diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml index a154685..e66ebdd 100644 --- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml +++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml @@ -506,7 +506,7 @@ MANAGED="True" </literallayout> </para></listitem> - <listitem><para><emphasis>Set Up Toaster for Normal Usage:</emphasis> +<!-- <listitem><para><emphasis>Set Up Toaster for Normal Usage:</emphasis> You need to configure each build environment, layer sources, and BitBake versions.</para> <para>Verify that your releases have been loaded correctly by @@ -539,9 +539,9 @@ # Go to Home, Bitbake Versions, Add bitbake version; # Take version information from: http://git.openembedded.org/bitbake/refs/heads, - # This example assumes "master" version. - # set Name: master, Giturl git://git.openembedded.org/bitbake - # branch master, dirpath / + # This example assumes "fido" version. + # set Name: fido, Giturl git://git.openembedded.org/bitbake + # branch fido, dirpath / # Save your changes and exit </literallayout> You also need to configure the project releases, the @@ -550,19 +550,19 @@ Continuing with the example: <literallayout class='monospaced'> # Go to Home, Releases, Add release - # set Name: master, Description: Current master release, select Bitbake Version, - # and Branch: master + # set Name: fido, Description: Current fido release, select Bitbake Version, + # and Branch: fido # Save your changes and exit # Go to Home, Toaster Settings, select the Setting for DEFAULT_RELEASE - # set Helptext: This selects the default release., Value: master + # set Helptext: This selects the default release., Value: fido # Save your changes and exit # Go to Home, Bitbake Versions, Add bitbake version; # 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 / + # this manual assumes the fido version + # set Name: fido, Giturl git://git.openembedded.org/bitbake + # branch fido, dirpath / # Save your changes and exit # Update the information @@ -573,6 +573,7 @@ "<link linkend='toaster-useful-commands'>Useful Commands</link>" section. </para></listitem> +--> <listitem><para><emphasis>Install and Set up the Database Server:</emphasis> You can use any SQL server out of the box. It is recommended that you use |