diff options
author | Belen Barros Pena <belen.barros.pena@linux.intel.com> | 2015-03-25 14:14:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-31 22:23:12 +0100 |
commit | feb84ef42ac30f090c2d79108b50162cfd892dd5 (patch) | |
tree | 1896245f1b43dd880fb1698475d726dbec34da2d /meta/conf | |
parent | 66710890c6b66230f92e31bcf6cff29406f18ad7 (diff) | |
download | poky-feb84ef42ac30f090c2d79108b50162cfd892dd5.tar.gz |
toaster: update toasterconf.json for fido release
We update the toasterconf.json for the 1.8 "fido"
release.
A small update to the release help text in the
toasterconf.json file shipped with the
openembedded-core layer.
We now make explicit that Toaster will build with
the tip of the selected branch, and we add links
to the OpenEmbedded repository.
(From OE-Core rev: f5af78cabb693692fa369730af4b0c70cca9bc91)
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 | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json index aac478e1ec..c8e42efadd 100644 --- a/meta/conf/toasterconf.json +++ b/meta/conf/toasterconf.json | |||
@@ -12,7 +12,7 @@ | |||
12 | "name": "Local OpenEmbedded", | 12 | "name": "Local OpenEmbedded", |
13 | "sourcetype": "local", | 13 | "sourcetype": "local", |
14 | "apiurl": "../../", | 14 | "apiurl": "../../", |
15 | "branches": ["HEAD", "master", "dizzy"], | 15 | "branches": ["HEAD", "master", "fido", "dizzy"], |
16 | "layers": [ | 16 | "layers": [ |
17 | { | 17 | { |
18 | "name": "openembedded-core", | 18 | "name": "openembedded-core", |
@@ -26,13 +26,13 @@ | |||
26 | "name": "OpenEmbedded", | 26 | "name": "OpenEmbedded", |
27 | "sourcetype": "layerindex", | 27 | "sourcetype": "layerindex", |
28 | "apiurl": "http://layers.openembedded.org/layerindex/api/", | 28 | "apiurl": "http://layers.openembedded.org/layerindex/api/", |
29 | "branches": ["master", "dizzy"] | 29 | "branches": ["master", "fido", "dizzy"] |
30 | }, | 30 | }, |
31 | { | 31 | { |
32 | "name": "Imported layers", | 32 | "name": "Imported layers", |
33 | "sourcetype": "imported", | 33 | "sourcetype": "imported", |
34 | "apiurl": "", | 34 | "apiurl": "", |
35 | "branches": ["master", "dizzy", "HEAD"] | 35 | "branches": ["master", "fido", "dizzy", "HEAD"] |
36 | 36 | ||
37 | } | 37 | } |
38 | ], | 38 | ], |
@@ -44,6 +44,12 @@ | |||
44 | "dirpath": "" | 44 | "dirpath": "" |
45 | }, | 45 | }, |
46 | { | 46 | { |
47 | "name": "fido", | ||
48 | "giturl": "git://git.openembedded.org/bitbake", | ||
49 | "branch": "1.26", | ||
50 | "dirpath": "" | ||
51 | }, | ||
52 | { | ||
47 | "name": "dizzy", | 53 | "name": "dizzy", |
48 | "giturl": "git://git.openembedded.org/bitbake", | 54 | "giturl": "git://git.openembedded.org/bitbake", |
49 | "branch": "1.24", | 55 | "branch": "1.24", |
@@ -67,7 +73,16 @@ | |||
67 | "branch": "master", | 73 | "branch": "master", |
68 | "defaultlayers": [ "openembedded-core" ], | 74 | "defaultlayers": [ "openembedded-core" ], |
69 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | 75 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, |
70 | "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." | 76 | "helptext": "Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch, where active development takes place. This is not a stable branch, so your builds might not work as expected." |
77 | }, | ||
78 | { | ||
79 | "name": "fido", | ||
80 | "description": "OpenEmbedded Fido", | ||
81 | "bitbake": "fido", | ||
82 | "branch": "fido", | ||
83 | "defaultlayers": [ "openembedded-core" ], | ||
84 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | ||
85 | "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=fido\">OpenEmbedded \"Fido\"</a> branch" | ||
71 | }, | 86 | }, |
72 | { | 87 | { |
73 | "name": "dizzy", | 88 | "name": "dizzy", |
@@ -76,7 +91,7 @@ | |||
76 | "branch": "dizzy", | 91 | "branch": "dizzy", |
77 | "defaultlayers": [ "openembedded-core" ], | 92 | "defaultlayers": [ "openembedded-core" ], |
78 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | 93 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, |
79 | "helptext": "Toaster will run your builds with the OpenEmbedded Dizzy release" | 94 | "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=dizzy\">OpenEmbedded \"Dizzy\"</a> branch" |
80 | }, | 95 | }, |
81 | { | 96 | { |
82 | "name": "local", | 97 | "name": "local", |