From e3425d4b0d285a71b061dcea1e0b084033054e4f Mon Sep 17 00:00:00 2001 From: Scott Rifenbark Date: Wed, 4 Nov 2015 10:19:12 -0800 Subject: 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 Signed-off-by: Richard Purdie --- .../toaster-manual/toaster-manual-reference.xml | 68 +++++++--------------- .../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 0c9401ff30..381e4c34a6 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. @@ -387,14 +386,6 @@ or . - Yocto Project "Master" or OpenEmbedded "Master": - This release causes your Toaster Projects to - build against the head of the master branch, which is - where active development takes place, at - - or - . - Local Yocto Project or Local OpenEmbedded: This release causes your Toaster Projects to build against the head of the poky @@ -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: "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 (branch) 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. Default Layers: The set of default layers @@ -522,8 +513,8 @@ 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 openembedded-core layer as the one to be added by default to any projects created in Toaster. @@ -532,13 +523,13 @@ "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." } ] @@ -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 @@ 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. HEAD is a special option that builds whatever is available on disk, without checking out any remote @@ -775,12 +766,6 @@ Here is the default bitbake area: "bitbake" : [ - { - "name": "master", - "giturl": "remote:origin", - "branch": "master", - "dirpath": "bitbake" - }, { "name": "fido", "giturl": "remote:origin", @@ -810,14 +795,14 @@ 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. Here is the statement in the JSON file that establishes the default release: - "defaultrelease": "master", + "defaultrelease": "fido", @@ -838,15 +823,6 @@ Here is the default releases area: "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", diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml index a1546858d9..e66ebdd757 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" - Set Up Toaster for Normal Usage: + Install and Set up the Database Server: You can use any SQL server out of the box. It is recommended that you use -- cgit v1.2.3-54-g00ecf