diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2015-10-02 12:38:45 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-21 23:06:33 +0100 |
commit | 98d7d24a37c809a793496db0c4227e6b592bcb26 (patch) | |
tree | db9ff7de1805089405dbd13dbf31b775a7572a84 /documentation/toaster-manual | |
parent | b263a3e1217460b099b4bea05b5126e554b0df22 (diff) | |
download | poky-98d7d24a37c809a793496db0c4227e6b592bcb26.tar.gz |
toaster-manual: Updates to example toasterconf.json file
Fixes [YOCTO #8428]
The changes to the .json file are now shown in the documentation.
(From yocto-docs rev: 5636632f0a2f0d79d632c72037c4306cfad3ec75)
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.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml index a0ed88b943..92938ca8d0 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", "jethro"], | 222 | "branches": ["HEAD", "master", "jethro","fido"], |
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", "jethro"] | 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", "fido", "jethro", "HEAD"] | 255 | "branches": ["master", "jethro","fido", "HEAD"] |
256 | 256 | ||
257 | } | 257 | } |
258 | ], | 258 | ], |
@@ -538,7 +538,7 @@ | |||
538 | "branch": "master", | 538 | "branch": "master", |
539 | "defaultlayers": [ "openembedded-core" ], | 539 | "defaultlayers": [ "openembedded-core" ], |
540 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | 540 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, |
541 | "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." | 541 | "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." |
542 | } | 542 | } |
543 | ] | 543 | ] |
544 | </literallayout> | 544 | </literallayout> |