]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
toaster-manual: Updates to example toasterconf.json file
authorScott Rifenbark <srifenbark@gmail.com>
Fri, 2 Oct 2015 19:38:45 +0000 (12:38 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 21 Oct 2015 22:06:33 +0000 (23:06 +0100)
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>
documentation/toaster-manual/toaster-manual-reference.xml

index a0ed88b943ac00139c91b7d47b27887a22bed76b..92938ca8d081b9107e71242593c00c831788d98d 100644 (file)
              "name": "Local Yocto Project",
              "sourcetype": "local",
              "apiurl": "../../",
-             "branches": ["HEAD", "master", "fido", "jethro"],
+             "branches": ["HEAD", "master", "jethro","fido"],
              "layers": [
                  {
                      "name": "openembedded-core",
              "name": "OpenEmbedded",
              "sourcetype": "layerindex",
              "apiurl": "http://layers.openembedded.org/layerindex/api/",
-             "branches": ["master", "fido", "jethro"]
+             "branches": ["master", "jethro","fido" ]
          },
          {
              "name": "Imported layers",
              "sourcetype": "imported",
              "apiurl": "",
-             "branches": ["master", "fido", "jethro", "HEAD"]
+             "branches": ["master", "jethro","fido", "HEAD"]
 
          }
      ],
              "branch": "master",
              "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 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."
          }
      ]
                 </literallayout>