summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/toaster-manual/toaster-manual-reference.xml40
1 files changed, 20 insertions, 20 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index 0c9401ff30..a0ed88b943 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -219,7 +219,7 @@
219 "name": "Local Yocto Project", 219 "name": "Local Yocto Project",
220 "sourcetype": "local", 220 "sourcetype": "local",
221 "apiurl": "../../", 221 "apiurl": "../../",
222 "branches": ["HEAD", "master", "fido", "dizzy"], 222 "branches": ["HEAD", "master", "fido", "jethro"],
223 "layers": [ 223 "layers": [
224 { 224 {
225 "name": "openembedded-core", 225 "name": "openembedded-core",
@@ -246,13 +246,13 @@
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", "fido", "dizzy"] 249 "branches": ["master", "fido", "jethro"]
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", "fido", "dizzy", "HEAD"] 255 "branches": ["master", "fido", "jethro", "HEAD"]
256 256
257 } 257 }
258 ], 258 ],
@@ -268,7 +268,7 @@
268 indicate which branches from your layer source you want 268 indicate which branches from your layer source you want
269 to make available through Toaster. 269 to make available through Toaster.
270 For example, the OpenEmbedded layer source makes 270 For example, the OpenEmbedded layer source makes
271 available only its "master", "fido", and "dizzy" 271 available only its "master", "fido", and "jethro"
272 branches. 272 branches.
273 </para> 273 </para>
274 274
@@ -373,12 +373,12 @@
373 As shipped, Toaster is configured to work with the following 373 As shipped, Toaster is configured to work with the following
374 releases: 374 releases:
375 <itemizedlist> 375 <itemizedlist>
376 <listitem><para><emphasis>Yocto Project 1.7 "Dizzy" or OpenEmbedded "Dizzy":</emphasis> 376 <listitem><para><emphasis>Yocto Project 2.0 "Jethro" or OpenEmbedded "Jethro":</emphasis>
377 This release causes your Toaster projects to 377 This release causes your Toaster projects to
378 build against the head of the dizzy branch at 378 build against the head of the jethro branch at
379 <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/log/?h=dizzy'></ulink> 379 <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/log/?h=jethro'></ulink>
380 or 380 or
381 <ulink url='http://git.openembedded.org/openembedded-core/commit/?h=dizzy'></ulink>. 381 <ulink url='http://git.openembedded.org/openembedded-core/commit/?h=jethro'></ulink>.
382 </para></listitem> 382 </para></listitem>
383 <listitem><para><emphasis>Yocto Project 1.8 "Fido" or OpenEmbedded "Fido":</emphasis> 383 <listitem><para><emphasis>Yocto Project 1.8 "Fido" or OpenEmbedded "Fido":</emphasis>
384 This release causes your Toaster projects to 384 This release causes your Toaster projects to
@@ -489,7 +489,7 @@
489 The branch for the layer source 489 The branch for the layer source
490 (<filename>branch</filename>) used with the release. 490 (<filename>branch</filename>) used with the release.
491 For example, for the OpenEmbedded layer source, the 491 For example, for the OpenEmbedded layer source, the
492 "master", "fido", and "dizzy" branches are available. 492 "master", "fido", and "jethro" branches are available.
493 </para></listitem> 493 </para></listitem>
494 <listitem><para><emphasis>Default Layers:</emphasis> 494 <listitem><para><emphasis>Default Layers:</emphasis>
495 The set of default layers 495 The set of default layers
@@ -715,7 +715,7 @@
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", "dizzy"], 718 "branches": ["HEAD", "master", "fido", "jethro"],
719 "layers": [ 719 "layers": [
720 { 720 {
721 "name": "openembedded-core", 721 "name": "openembedded-core",
@@ -742,13 +742,13 @@
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", "dizzy"] 745 "branches": ["master", "fido", "jethro"]
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", "dizzy", "HEAD"] 751 "branches": ["master", "fido", "jethro", "HEAD"]
752 752
753 } 753 }
754 ], 754 ],
@@ -763,7 +763,7 @@
763 This area of the JSON file defines the version of 763 This area of the JSON file defines the version of
764 BitBake Toaster uses. 764 BitBake Toaster uses.
765 As shipped, Toaster is configured to recognize four 765 As shipped, Toaster is configured to recognize four
766 versions of BitBake: master, fido, dizzy, and HEAD. 766 versions of BitBake: master, fido, jethro, and HEAD.
767 <note> 767 <note>
768 HEAD is a special option that builds whatever is 768 HEAD is a special option that builds whatever is
769 available on disk, without checking out any remote 769 available on disk, without checking out any remote
@@ -788,9 +788,9 @@
788 "dirpath": "bitbake" 788 "dirpath": "bitbake"
789 }, 789 },
790 { 790 {
791 "name": "dizzy", 791 "name": "jethro",
792 "giturl": "remote:origin", 792 "giturl": "remote:origin",
793 "branch": "dizzy", 793 "branch": "jethro",
794 "dirpath": "bitbake" 794 "dirpath": "bitbake"
795 }, 795 },
796 { 796 {
@@ -857,13 +857,13 @@
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." 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 }, 858 },
859 { 859 {
860 "name": "dizzy", 860 "name": "jethro",
861 "description": "Yocto Project 1.7 Dizzy", 861 "description": "Yocto Project 2.0 Jethro",
862 "bitbake": "dizzy", 862 "bitbake": "jethro",
863 "branch": "dizzy", 863 "branch": "jethro",
864 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 864 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
865 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, 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=dizzy\"&gt;Yocto Project 1.7 \"Dizzy\"&lt;/a&gt; branch." 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."
867 }, 867 },
868 { 868 {
869 "name": "local", 869 "name": "local",