diff options
author | Belen Barros Pena <belen.barros.pena@linux.intel.com> | 2014-11-27 16:53:35 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-28 14:02:55 +0000 |
commit | e2cf2d1fc50316d6ec14e5208ff4fe5601b6d10c (patch) | |
tree | 6eb8acc3f3e5364d053779d9b7f6d1d4ef2cb6d0 /meta/conf | |
parent | 99262b6b737f435941933681f7d720d2f908f0d6 (diff) | |
download | poky-e2cf2d1fc50316d6ec14e5208ff4fe5601b6d10c.tar.gz |
toaster: naming and description changes
Some minor changes to the names and descriptions
used in the Toaster configuration file:
* Change the name of the local layer source from Local OE-Core
to Local OpenEmbedded
* Change the imported layer source name from User Imported Layers
to just Imported layers. It is shorter, which helps table display
* Change the description of the master release from OE-Core
master to OpenEmbedded master
* Change the description of the dizzy release from OE-Core dizzy
to OpenEmbedded Dizzy
* Change the helptext of the dizzy release to remove the
"latest" reference, which can make maintenance hard
* Change the name of the Local Yocto Project release to Local
OpenEmbedded
(From OE-Core rev: 151475009fe8cd105ba3964cd9c23fe7b9af11a8)
Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/toasterconf.json | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json index c9835d08ae..fe1564ec26 100644 --- a/meta/conf/toasterconf.json +++ b/meta/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 OE-Core", | 5 | "name": "Local OpenEmbedded", |
6 | "sourcetype": "local", | 6 | "sourcetype": "local", |
7 | "apiurl": "../../", | 7 | "apiurl": "../../", |
8 | "branches": ["HEAD", "master", "dizzy"], | 8 | "branches": ["HEAD", "master", "dizzy"], |
@@ -22,7 +22,7 @@ | |||
22 | "branches": ["master", "dizzy"] | 22 | "branches": ["master", "dizzy"] |
23 | }, | 23 | }, |
24 | { | 24 | { |
25 | "name": "User Imported Layers", | 25 | "name": "Imported layers", |
26 | "sourcetype": "imported", | 26 | "sourcetype": "imported", |
27 | "apiurl": "", | 27 | "apiurl": "", |
28 | "branches": ["master", "dizzy", "HEAD"] | 28 | "branches": ["master", "dizzy", "HEAD"] |
@@ -55,30 +55,30 @@ | |||
55 | "releases": [ | 55 | "releases": [ |
56 | { | 56 | { |
57 | "name": "master", | 57 | "name": "master", |
58 | "description": "OE-Core master", | 58 | "description": "OpenEmbedded master", |
59 | "bitbake": "master", | 59 | "bitbake": "master", |
60 | "branch": "master", | 60 | "branch": "master", |
61 | "defaultlayers": [ "openembedded-core" ], | 61 | "defaultlayers": [ "openembedded-core" ], |
62 | "layersourcepriority": { "User Imported Layers": 99, "Local OE-Core" : 10, "OpenEmbedded" : 0 }, | 62 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, |
63 | "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." | 63 | "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." |
64 | }, | 64 | }, |
65 | { | 65 | { |
66 | "name": "dizzy", | 66 | "name": "dizzy", |
67 | "description": "OE-Core dizzy", | 67 | "description": "OpenEmbedded Dizzy", |
68 | "bitbake": "dizzy", | 68 | "bitbake": "dizzy", |
69 | "branch": "dizzy", | 69 | "branch": "dizzy", |
70 | "defaultlayers": [ "openembedded-core" ], | 70 | "defaultlayers": [ "openembedded-core" ], |
71 | "layersourcepriority": { "User Imported Layers": 99, "Local OE-Core" : 10, "OpenEmbedded" : 0 }, | 71 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, |
72 | "helptext": "Toaster will run your builds with the latest OpenEmbedded release, the dizzy branch." | 72 | "helptext": "Toaster will run your builds with the OpenEmbedded Dizzy release" |
73 | }, | 73 | }, |
74 | { | 74 | { |
75 | "name": "local", | 75 | "name": "local", |
76 | "description": "Local Yocto Project", | 76 | "description": "Local OpenEmbedded", |
77 | "bitbake": "HEAD", | 77 | "bitbake": "HEAD", |
78 | "branch": "HEAD", | 78 | "branch": "HEAD", |
79 | "defaultlayers": [ "openembedded-core" ], | 79 | "defaultlayers": [ "openembedded-core" ], |
80 | "layersourcepriority": { "User Imported Layers": 99, "Local OE-Core" : 10, "OpenEmbedded" : 0 }, | 80 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, |
81 | "helptext": "Toaster will run your builds with the version of the OpenEmbedded that you have cloned or downloaded to your computer." | 81 | "helptext": "Toaster will run your builds with the version of OpenEmbedded that you have cloned or downloaded to your computer." |
82 | } | 82 | } |
83 | ] | 83 | ] |
84 | } | 84 | } |