diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-06-03 11:52:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 15:02:19 +0100 |
commit | 8f51f6153a09f8048fb4c4ce9cf4a19655240de4 (patch) | |
tree | c0c78f33d2cfff4b6ca275c64ef614e46582d997 /meta | |
parent | 829706d3c5f10883a7ff2b81983dea805d44f412 (diff) | |
download | poky-8f51f6153a09f8048fb4c4ce9cf4a19655240de4.tar.gz |
toasterconf.json: exclude releases Toaster can't build
Due to changes in master to support Python 3, Toaster is no
longer able to build from master.
Remove references to master and set default release to krogoth.
(From OE-Core rev: b0b91490e4ede61a302eb547da2cc65aa7da87ff)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/toasterconf.json | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json index c27880e109..8c80eed25c 100644 --- a/meta/conf/toasterconf.json +++ b/meta/conf/toasterconf.json | |||
@@ -13,7 +13,7 @@ | |||
13 | "name": "Local OpenEmbedded", | 13 | "name": "Local OpenEmbedded", |
14 | "sourcetype": "local", | 14 | "sourcetype": "local", |
15 | "apiurl": "../../", | 15 | "apiurl": "../../", |
16 | "branches": ["HEAD", "master", "jethro", "krogoth"], | 16 | "branches": ["HEAD", "jethro", "krogoth"], |
17 | "layers": [ | 17 | "layers": [ |
18 | { | 18 | { |
19 | "name": "openembedded-core", | 19 | "name": "openembedded-core", |
@@ -27,24 +27,18 @@ | |||
27 | "name": "OpenEmbedded", | 27 | "name": "OpenEmbedded", |
28 | "sourcetype": "layerindex", | 28 | "sourcetype": "layerindex", |
29 | "apiurl": "http://layers.openembedded.org/layerindex/api/", | 29 | "apiurl": "http://layers.openembedded.org/layerindex/api/", |
30 | "branches": ["master", "jethro", "krogoth"] | 30 | "branches": ["jethro", "krogoth"] |
31 | }, | 31 | }, |
32 | { | 32 | { |
33 | "name": "Imported layers", | 33 | "name": "Imported layers", |
34 | "sourcetype": "imported", | 34 | "sourcetype": "imported", |
35 | "apiurl": "", | 35 | "apiurl": "", |
36 | "branches": ["master", "jethro", "krogoth", "HEAD"] | 36 | "branches": ["jethro", "krogoth", "HEAD"] |
37 | 37 | ||
38 | } | 38 | } |
39 | ], | 39 | ], |
40 | "bitbake" : [ | 40 | "bitbake" : [ |
41 | { | 41 | { |
42 | "name": "master", | ||
43 | "giturl": "git://git.openembedded.org/bitbake", | ||
44 | "branch": "master", | ||
45 | "dirpath": "" | ||
46 | }, | ||
47 | { | ||
48 | "name": "jethro", | 42 | "name": "jethro", |
49 | "giturl": "git://git.openembedded.org/bitbake", | 43 | "giturl": "git://git.openembedded.org/bitbake", |
50 | "branch": "1.28", | 44 | "branch": "1.28", |
@@ -64,19 +58,10 @@ | |||
64 | } | 58 | } |
65 | ], | 59 | ], |
66 | 60 | ||
67 | "defaultrelease": "master", | 61 | "defaultrelease": "krogoth", |
68 | 62 | ||
69 | "releases": [ | 63 | "releases": [ |
70 | { | 64 | { |
71 | "name": "master", | ||
72 | "description": "OpenEmbedded master", | ||
73 | "bitbake": "master", | ||
74 | "branch": "master", | ||
75 | "defaultlayers": [ "openembedded-core" ], | ||
76 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | ||
77 | "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." | ||
78 | }, | ||
79 | { | ||
80 | "name": "jethro", | 65 | "name": "jethro", |
81 | "description": "OpenEmbedded Jethro", | 66 | "description": "OpenEmbedded Jethro", |
82 | "bitbake": "jethro", | 67 | "bitbake": "jethro", |