diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-06-03 14:59:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 15:02:13 +0100 |
commit | 4b4e1821fb1a00e16206b7e0bddc19de3e12e95e (patch) | |
tree | 2c53efb17773b00818c0462d7cf55ccd52ed8039 | |
parent | df963f54f121938c6bec66a6bb1a1776617a3192 (diff) | |
download | poky-4b4e1821fb1a00e16206b7e0bddc19de3e12e95e.tar.gz |
toasterconf.json: exclude releases Toaster can't build
Due to the switch to Python 3, Toaster master can only build
with master and not with earlier releases.
Make master the default release for projects and remove previous
releases from configuration.
(From OE-Core rev: b96683079fc481080ba7b49731bec697b43edae8)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/toasterconf.json | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json index c27880e109..796125bbfd 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", "master"], |
17 | "layers": [ | 17 | "layers": [ |
18 | { | 18 | { |
19 | "name": "openembedded-core", | 19 | "name": "openembedded-core", |
@@ -27,13 +27,13 @@ | |||
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": ["master"] |
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": ["master", "HEAD"] |
37 | 37 | ||
38 | } | 38 | } |
39 | ], | 39 | ], |
@@ -45,18 +45,6 @@ | |||
45 | "dirpath": "" | 45 | "dirpath": "" |
46 | }, | 46 | }, |
47 | { | 47 | { |
48 | "name": "jethro", | ||
49 | "giturl": "git://git.openembedded.org/bitbake", | ||
50 | "branch": "1.28", | ||
51 | "dirpath": "" | ||
52 | }, | ||
53 | { | ||
54 | "name": "krogoth", | ||
55 | "giturl": "git://git.openembedded.org/bitbake", | ||
56 | "branch": "1.30", | ||
57 | "dirpath": "" | ||
58 | }, | ||
59 | { | ||
60 | "name": "HEAD", | 48 | "name": "HEAD", |
61 | "giturl": "git://git.openembedded.org/bitbake", | 49 | "giturl": "git://git.openembedded.org/bitbake", |
62 | "branch": "HEAD", | 50 | "branch": "HEAD", |
@@ -77,24 +65,6 @@ | |||
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." | 65 | "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 | }, | 66 | }, |
79 | { | 67 | { |
80 | "name": "jethro", | ||
81 | "description": "OpenEmbedded Jethro", | ||
82 | "bitbake": "jethro", | ||
83 | "branch": "jethro", | ||
84 | "defaultlayers": [ "openembedded-core" ], | ||
85 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | ||
86 | "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=jethro\">OpenEmbedded \"Jethro\"</a> branch" | ||
87 | }, | ||
88 | { | ||
89 | "name": "krogoth", | ||
90 | "description": "OpenEmbedded Krogoth", | ||
91 | "bitbake": "krogoth", | ||
92 | "branch": "krogoth", | ||
93 | "defaultlayers": [ "openembedded-core" ], | ||
94 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | ||
95 | "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=krogoth\">OpenEmbedded \"Krogoth\"</a> branch" | ||
96 | }, | ||
97 | { | ||
98 | "name": "local", | 68 | "name": "local", |
99 | "description": "Local OpenEmbedded", | 69 | "description": "Local OpenEmbedded", |
100 | "bitbake": "HEAD", | 70 | "bitbake": "HEAD", |