summaryrefslogtreecommitdiffstats
path: root/documentation/toaster-manual
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2015-10-06 09:29:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-21 23:06:34 +0100
commit2f4e90c6a3dca7b5f239223e28474276ce451c4c (patch)
treebdb5126a7a68da44b51b653be1e803a42e3703b9 /documentation/toaster-manual
parent66653cba91baea5eb41ee2f3b2026c1668f92c3f (diff)
downloadpoky-2f4e90c6a3dca7b5f239223e28474276ce451c4c.tar.gz
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>
Diffstat (limited to 'documentation/toaster-manual')
-rw-r--r--documentation/toaster-manual/toaster-manual-reference.xml194
1 files changed, 97 insertions, 97 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index 92938ca8d0..4d0f904b0f 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -214,48 +214,48 @@
214 In the file, you will find a section for layer sources 214 In the file, you will find a section for layer sources
215 such as the following: 215 such as the following:
216 <literallayout class='monospaced'> 216 <literallayout class='monospaced'>
217 "layersources": [ 217 "layersources": [
218 { 218 {
219 "name": "Local Yocto Project", 219 "name": "Local Yocto Project",
220 "sourcetype": "local", 220 "sourcetype": "local",
221 "apiurl": "../../", 221 "apiurl": "../../",
222 "branches": ["HEAD", "master", "jethro","fido"], 222 "branches": ["HEAD" ],
223 "layers": [ 223 "layers": [
224 { 224 {
225 "name": "openembedded-core", 225 "name": "openembedded-core",
226 "local_path": "meta", 226 "local_path": "meta",
227 "vcs_url": "remote:origin", 227 "vcs_url": "remote:origin",
228 "dirpath": "meta" 228 "dirpath": "meta"
229 }, 229 },
230 { 230 {
231 "name": "meta-yocto", 231 "name": "meta-yocto",
232 "local_path": "meta-yocto", 232 "local_path": "meta-yocto",
233 "vcs_url": "remote:origin", 233 "vcs_url": "remote:origin",
234 "dirpath": "meta-yocto" 234 "dirpath": "meta-yocto"
235 }, 235 },
236 { 236 {
237 "name": "meta-yocto-bsp", 237 "name": "meta-yocto-bsp",
238 "local_path": "meta-yocto-bsp", 238 "local_path": "meta-yocto-bsp",
239 "vcs_url": "remote:origin", 239 "vcs_url": "remote:origin",
240 "dirpath": "meta-yocto-bsp" 240 "dirpath": "meta-yocto-bsp"
241 } 241 }
242 242
243 ] 243 ]
244 }, 244 },
245 { 245 {
246 "name": "OpenEmbedded", 246 "name": "OpenEmbedded",
247 "sourcetype": "layerindex", 247 "sourcetype": "layerindex",
248 "apiurl": "http://layers.openembedded.org/layerindex/api/", 248 "apiurl": "http://layers.openembedded.org/layerindex/api/",
249 "branches": ["master", "jethro","fido" ] 249 "branches": ["master", "jethro" ,"fido"]
250 }, 250 },
251 { 251 {
252 "name": "Imported layers", 252 "name": "Imported layers",
253 "sourcetype": "imported", 253 "sourcetype": "imported",
254 "apiurl": "", 254 "apiurl": "",
255 "branches": ["master", "jethro","fido", "HEAD"] 255 "branches": ["master", "jethro","fido", "HEAD"]
256 256
257 } 257 }
258 ], 258 ],
259 </literallayout> 259 </literallayout>
260 You should add your own layer source to this section by 260 You should add your own layer source to this section by
261 following the same format used for the "OpenEmbedded" 261 following the same format used for the "OpenEmbedded"
@@ -710,48 +710,48 @@
710 <para> 710 <para>
711 Here is the default <filename>layersources</filename> area: 711 Here is the default <filename>layersources</filename> area:
712 <literallayout class='monospaced'> 712 <literallayout class='monospaced'>
713 "layersources": [ 713 "layersources": [
714 { 714 {
715 "name": "Local Yocto Project", 715 "name": "Local Yocto Project",
716 "sourcetype": "local", 716 "sourcetype": "local",
717 "apiurl": "../../", 717 "apiurl": "../../",
718 "branches": ["HEAD", "master", "fido", "jethro"], 718 "branches": ["HEAD" ],
719 "layers": [ 719 "layers": [
720 { 720 {
721 "name": "openembedded-core", 721 "name": "openembedded-core",
722 "local_path": "meta", 722 "local_path": "meta",
723 "vcs_url": "remote:origin", 723 "vcs_url": "remote:origin",
724 "dirpath": "meta" 724 "dirpath": "meta"
725 }, 725 },
726 { 726 {
727 "name": "meta-yocto", 727 "name": "meta-yocto",
728 "local_path": "meta-yocto", 728 "local_path": "meta-yocto",
729 "vcs_url": "remote:origin", 729 "vcs_url": "remote:origin",
730 "dirpath": "meta-yocto" 730 "dirpath": "meta-yocto"
731 }, 731 },
732 { 732 {
733 "name": "meta-yocto-bsp", 733 "name": "meta-yocto-bsp",
734 "local_path": "meta-yocto-bsp", 734 "local_path": "meta-yocto-bsp",
735 "vcs_url": "remote:origin", 735 "vcs_url": "remote:origin",
736 "dirpath": "meta-yocto-bsp" 736 "dirpath": "meta-yocto-bsp"
737 } 737 }
738 738
739 ] 739 ]
740 }, 740 },
741 { 741 {
742 "name": "OpenEmbedded", 742 "name": "OpenEmbedded",
743 "sourcetype": "layerindex", 743 "sourcetype": "layerindex",
744 "apiurl": "http://layers.openembedded.org/layerindex/api/", 744 "apiurl": "http://layers.openembedded.org/layerindex/api/",
745 "branches": ["master", "fido", "jethro"] 745 "branches": ["master", "jethro" ,"fido"]
746 }, 746 },
747 { 747 {
748 "name": "Imported layers", 748 "name": "Imported layers",
749 "sourcetype": "imported", 749 "sourcetype": "imported",
750 "apiurl": "", 750 "apiurl": "",
751 "branches": ["master", "fido", "jethro", "HEAD"] 751 "branches": ["master", "jethro","fido", "HEAD"]
752 752
753 } 753 }
754 ], 754 ],
755 </literallayout> 755 </literallayout>
756 </para> 756 </para>
757 </section> 757 </section>
@@ -781,12 +781,6 @@
781 "branch": "master", 781 "branch": "master",
782 "dirpath": "bitbake" 782 "dirpath": "bitbake"
783 }, 783 },
784 {
785 "name": "fido",
786 "giturl": "remote:origin",
787 "branch": "fido",
788 "dirpath": "bitbake"
789 },
790 { 784 {
791 "name": "jethro", 785 "name": "jethro",
792 "giturl": "remote:origin", 786 "giturl": "remote:origin",
@@ -794,6 +788,12 @@
794 "dirpath": "bitbake" 788 "dirpath": "bitbake"
795 }, 789 },
796 { 790 {
791 "name": "fido",
792 "giturl": "remote:origin",
793 "branch": "fido",
794 "dirpath": "bitbake"
795 },
796 {
797 "name": "HEAD", 797 "name": "HEAD",
798 "giturl": "remote:origin", 798 "giturl": "remote:origin",
799 "branch": "HEAD", 799 "branch": "HEAD",
@@ -848,15 +848,6 @@
848 "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." 848 "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."
849 }, 849 },
850 { 850 {
851 "name": "fido",
852 "description": "Yocto Project 1.8 Fido",
853 "bitbake": "fido",
854 "branch": "fido",
855 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
856 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
857 "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."
858 },
859 {
860 "name": "jethro", 851 "name": "jethro",
861 "description": "Yocto Project 2.0 Jethro", 852 "description": "Yocto Project 2.0 Jethro",
862 "bitbake": "jethro", 853 "bitbake": "jethro",
@@ -866,6 +857,15 @@
866 "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." 857 "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."
867 }, 858 },
868 { 859 {
860 "name": "fido",
861 "description": "Yocto Project 1.8 Fido",
862 "bitbake": "fido",
863 "branch": "fido",
864 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
865 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
866 "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."
867 },
868 {
869 "name": "local", 869 "name": "local",
870 "description": "Local Yocto Project", 870 "description": "Local Yocto Project",
871 "bitbake": "HEAD", 871 "bitbake": "HEAD",