sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

toaster-manual: Updated the json file example bits to be current 

Fixes [YOCTO #8428]

(From yocto-docs rev: d719f76c6fb3d33b4633d2d64d448bf225af3298)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Scott Rifenbark 2015-10-06 09:29:52 -07:00 committed by Richard Purdie
parent 66653cba91
commit 2f4e90c6a3
1 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
documentation/toaster-manual/toaster-manual-reference.xml
View File

@ -214,48 +214,48 @@
In the file, you will find a section for layer sources In the file, you will find a section for layer sources
such as the following: such as the following:
<literallayout class='monospaced'> <literallayout class='monospaced'>
"layersources": [ "layersources": [
{ {
"name": "Local Yocto Project", "name": "Local Yocto Project",
"sourcetype": "local", "sourcetype": "local",
"apiurl": "../../", "apiurl": "../../",
"branches": ["HEAD", "master", "jethro","fido"], "branches": ["HEAD" ],
"layers": [ "layers": [
{ {
"name": "openembedded-core", "name": "openembedded-core",
"local_path": "meta", "local_path": "meta",
"vcs_url": "remote:origin", "vcs_url": "remote:origin",
"dirpath": "meta" "dirpath": "meta"
}, },
{ {
"name": "meta-yocto", "name": "meta-yocto",
"local_path": "meta-yocto", "local_path": "meta-yocto",
"vcs_url": "remote:origin", "vcs_url": "remote:origin",
"dirpath": "meta-yocto" "dirpath": "meta-yocto"
}, },
{ {
"name": "meta-yocto-bsp", "name": "meta-yocto-bsp",
"local_path": "meta-yocto-bsp", "local_path": "meta-yocto-bsp",
"vcs_url": "remote:origin", "vcs_url": "remote:origin",
"dirpath": "meta-yocto-bsp" "dirpath": "meta-yocto-bsp"
} }
] ]
}, },
{ {
"name": "OpenEmbedded", "name": "OpenEmbedded",
"sourcetype": "layerindex", "sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/", "apiurl": "http://layers.openembedded.org/layerindex/api/",
"branches": ["master", "jethro","fido" ] "branches": ["master", "jethro" ,"fido"]
}, },
{ {
"name": "Imported layers", "name": "Imported layers",
"sourcetype": "imported", "sourcetype": "imported",
"apiurl": "", "apiurl": "",
"branches": ["master", "jethro","fido", "HEAD"] "branches": ["master", "jethro","fido", "HEAD"]
} }
], ],
</literallayout> </literallayout>
You should add your own layer source to this section by You should add your own layer source to this section by
following the same format used for the "OpenEmbedded" following the same format used for the "OpenEmbedded"
@ -710,48 +710,48 @@
<para> <para>
Here is the default <filename>layersources</filename> area: Here is the default <filename>layersources</filename> area:
<literallayout class='monospaced'> <literallayout class='monospaced'>
"layersources": [ "layersources": [
{ {
"name": "Local Yocto Project", "name": "Local Yocto Project",
"sourcetype": "local", "sourcetype": "local",
"apiurl": "../../", "apiurl": "../../",
"branches": ["HEAD", "master", "fido", "jethro"], "branches": ["HEAD" ],
"layers": [ "layers": [
{ {
"name": "openembedded-core", "name": "openembedded-core",
"local_path": "meta", "local_path": "meta",
"vcs_url": "remote:origin", "vcs_url": "remote:origin",
"dirpath": "meta" "dirpath": "meta"
}, },
{ {
"name": "meta-yocto", "name": "meta-yocto",
"local_path": "meta-yocto", "local_path": "meta-yocto",
"vcs_url": "remote:origin", "vcs_url": "remote:origin",
"dirpath": "meta-yocto" "dirpath": "meta-yocto"
}, },
{ {
"name": "meta-yocto-bsp", "name": "meta-yocto-bsp",
"local_path": "meta-yocto-bsp", "local_path": "meta-yocto-bsp",
"vcs_url": "remote:origin", "vcs_url": "remote:origin",
"dirpath": "meta-yocto-bsp" "dirpath": "meta-yocto-bsp"
} }
] ]
}, },
{ {
"name": "OpenEmbedded", "name": "OpenEmbedded",
"sourcetype": "layerindex", "sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/", "apiurl": "http://layers.openembedded.org/layerindex/api/",
"branches": ["master", "fido", "jethro"] "branches": ["master", "jethro" ,"fido"]
}, },
{ {
"name": "Imported layers", "name": "Imported layers",
"sourcetype": "imported", "sourcetype": "imported",
"apiurl": "", "apiurl": "",
"branches": ["master", "fido", "jethro", "HEAD"] "branches": ["master", "jethro","fido", "HEAD"]
} }
], ],
</literallayout> </literallayout>
</para> </para>
</section> </section>
@ -781,18 +781,18 @@
"branch": "master", "branch": "master",
"dirpath": "bitbake" "dirpath": "bitbake"
}, },
{
"name": "fido",
"giturl": "remote:origin",
"branch": "fido",
"dirpath": "bitbake"
},
{ {
"name": "jethro", "name": "jethro",
"giturl": "remote:origin", "giturl": "remote:origin",
"branch": "jethro", "branch": "jethro",
"dirpath": "bitbake" "dirpath": "bitbake"
}, },
{
"name": "fido",
"giturl": "remote:origin",
"branch": "fido",
"dirpath": "bitbake"
},
{ {
"name": "HEAD", "name": "HEAD",
"giturl": "remote:origin", "giturl": "remote:origin",
@ -847,15 +847,6 @@
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds using the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\"&gt;Yocto Project master branch&lt;/a&gt;, 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 tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\"&gt;Yocto Project master branch&lt;/a&gt;, 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",
"branch": "fido",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\"&gt;Yocto Project 1.8 \"Fido\"&lt;/a&gt; branch."
},
{ {
"name": "jethro", "name": "jethro",
"description": "Yocto Project 2.0 Jethro", "description": "Yocto Project 2.0 Jethro",
@ -865,6 +856,15 @@
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\"&gt;Yocto Project 2.0 \"Jethro\"&lt;/a&gt; branch." "helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\"&gt;Yocto Project 2.0 \"Jethro\"&lt;/a&gt; branch."
}, },
{
"name": "fido",
"description": "Yocto Project 1.8 Fido",
"bitbake": "fido",
"branch": "fido",
"defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
"layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
"helptext": "Toaster will run your builds with the tip of the &lt;a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\"&gt;Yocto Project 1.8 \"Fido\"&lt;/a&gt; branch."
},
{ {
"name": "local", "name": "local",
"description": "Local Yocto Project", "description": "Local Yocto Project",