summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2014-12-10 15:01:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-18 10:21:50 +0000
commitc467bbd841d6ef2caae7fb2693456c50584d23ec (patch)
treeee00e37ee7f3e1a9102d9d4fa8e71ada2ee82230 /meta-yocto/conf
parentfb760054d4fa39d1f266d7d6b8acd5fa9a66f8cb (diff)
downloadpoky-c467bbd841d6ef2caae7fb2693456c50584d23ec.tar.gz
toasterconf: naming and description changes
Some minor changes to the names and descriptions used in the Toaster configuration file: * Change the local layer source name from Local Poky to Local Yocto Project to match release naming, which makes no reference to Poky * Change Imported Layer Source to just Imported layers. It is shorter, which helps table display * Change the helptext of the dizzy release to remove the "latest" reference, since might make maintenance hard (From meta-yocto rev: ab1326597bbc505c5beade577206de78cda2dae8) Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com> Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/toasterconf.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json
index e0a07b9517..14d62b1dcf 100644
--- a/meta-yocto/conf/toasterconf.json
+++ b/meta-yocto/conf/toasterconf.json
@@ -2,7 +2,7 @@
2 "config": {"MACHINE": "qemux86", "DISTRO": "poky"}, 2 "config": {"MACHINE": "qemux86", "DISTRO": "poky"},
3 "layersources": [ 3 "layersources": [
4 { 4 {
5 "name": "Local Poky", 5 "name": "Local Yocto Project",
6 "sourcetype": "local", 6 "sourcetype": "local",
7 "apiurl": "../../", 7 "apiurl": "../../",
8 "branches": ["HEAD", "master", "dizzy"], 8 "branches": ["HEAD", "master", "dizzy"],
@@ -35,7 +35,7 @@
35 "branches": ["master", "dizzy"] 35 "branches": ["master", "dizzy"]
36 }, 36 },
37 { 37 {
38 "name": "User Imported Layers", 38 "name": "Imported layers",
39 "sourcetype": "imported", 39 "sourcetype": "imported",
40 "apiurl": "", 40 "apiurl": "",
41 "branches": ["master", "dizzy", "HEAD"] 41 "branches": ["master", "dizzy", "HEAD"]
@@ -72,7 +72,7 @@
72 "bitbake": "master", 72 "bitbake": "master",
73 "branch": "master", 73 "branch": "master",
74 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 74 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
75 "layersourcepriority": { "User Imported Layers": 99, "Local Poky" : 10, "OpenEmbedded" : 0 }, 75 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
76 "helptext": "Toaster will run your builds using 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." 76 "helptext": "Toaster will run your builds using 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."
77 }, 77 },
78 { 78 {
@@ -81,8 +81,8 @@
81 "bitbake": "dizzy", 81 "bitbake": "dizzy",
82 "branch": "dizzy", 82 "branch": "dizzy",
83 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 83 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
84 "layersourcepriority": { "User Imported Layers": 99, "Local Poky" : 10, "OpenEmbedded" : 0 }, 84 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
85 "helptext": "Toaster will run your builds with the latest Yocto Project release, <a href=\"https://www.yoctoproject.org/downloads/core/dizzy17\">1.7 \"Dizzy\"</a>" 85 "helptext": "Toaster will run your builds with the <a href=\"https://www.yoctoproject.org/downloads/core/dizzy1\">Yocto Project 1.7 \"Dizzy\"</a> release"
86 }, 86 },
87 { 87 {
88 "name": "local", 88 "name": "local",
@@ -90,7 +90,7 @@
90 "bitbake": "HEAD", 90 "bitbake": "HEAD",
91 "branch": "HEAD", 91 "branch": "HEAD",
92 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], 92 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
93 "layersourcepriority": { "User Imported Layers": 99, "Local Poky" : 10, "OpenEmbedded" : 0 }, 93 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
94 "helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer." 94 "helptext": "Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer."
95 } 95 }
96 ] 96 ]