diff options
author | Elliot Smith <elliot.smith@intel.com> | 2016-06-03 11:09:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 15:02:25 +0100 |
commit | ddbc13155f4db5d98976dc93b586c0be4fc740d1 (patch) | |
tree | a746a996f67e250bfd1e6017901d846a52c04187 | |
parent | 32728d09462d66cb0e9d5e366154b63058cb8709 (diff) | |
download | poky-ddbc13155f4db5d98976dc93b586c0be4fc740d1.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 jethro.
The dizzy release should also be removed, as Toaster jethro
is unable to build using this release.
(From OE-Core rev: 1f4bfa33073584c25396d74f3929f263f3df188b)
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 | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json index c8e42efadd..8a17ee6a09 100644 --- a/meta/conf/toasterconf.json +++ b/meta/conf/toasterconf.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "config": { | 2 | "config": { |
3 | "MACHINE" : "qemux86", | 3 | "MACHINE" : "qemux86", |
4 | "DISTRO" : "poky", | 4 | "DISTRO" : "nodistro", |
5 | "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2", | 5 | "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2", |
6 | "IMAGE_INSTALL_append": "", | 6 | "IMAGE_INSTALL_append": "", |
7 | "PACKAGE_CLASSES": "package_rpm", | 7 | "PACKAGE_CLASSES": "package_rpm", |
@@ -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", "fido", "dizzy"], | 15 | "branches": ["HEAD", "jethro", "fido"], |
16 | "layers": [ | 16 | "layers": [ |
17 | { | 17 | { |
18 | "name": "openembedded-core", | 18 | "name": "openembedded-core", |
@@ -26,21 +26,21 @@ | |||
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", "fido", "dizzy"] | 29 | "branches": ["jethro", "fido"] |
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", "fido", "dizzy", "HEAD"] | 35 | "branches": ["jethro", "fido", "HEAD"] |
36 | 36 | ||
37 | } | 37 | } |
38 | ], | 38 | ], |
39 | "bitbake" : [ | 39 | "bitbake" : [ |
40 | { | 40 | { |
41 | "name": "master", | 41 | "name": "jethro", |
42 | "giturl": "git://git.openembedded.org/bitbake", | 42 | "giturl": "git://git.openembedded.org/bitbake", |
43 | "branch": "master", | 43 | "branch": "1.28", |
44 | "dirpath": "" | 44 | "dirpath": "" |
45 | }, | 45 | }, |
46 | { | 46 | { |
@@ -50,12 +50,6 @@ | |||
50 | "dirpath": "" | 50 | "dirpath": "" |
51 | }, | 51 | }, |
52 | { | 52 | { |
53 | "name": "dizzy", | ||
54 | "giturl": "git://git.openembedded.org/bitbake", | ||
55 | "branch": "1.24", | ||
56 | "dirpath": "" | ||
57 | }, | ||
58 | { | ||
59 | "name": "HEAD", | 53 | "name": "HEAD", |
60 | "giturl": "git://git.openembedded.org/bitbake", | 54 | "giturl": "git://git.openembedded.org/bitbake", |
61 | "branch": "HEAD", | 55 | "branch": "HEAD", |
@@ -63,17 +57,17 @@ | |||
63 | } | 57 | } |
64 | ], | 58 | ], |
65 | 59 | ||
66 | "defaultrelease": "master", | 60 | "defaultrelease": "jethro", |
67 | 61 | ||
68 | "releases": [ | 62 | "releases": [ |
69 | { | 63 | { |
70 | "name": "master", | 64 | "name": "jethro", |
71 | "description": "OpenEmbedded master", | 65 | "description": "OpenEmbedded Jethro", |
72 | "bitbake": "master", | 66 | "bitbake": "jethro", |
73 | "branch": "master", | 67 | "branch": "jethro", |
74 | "defaultlayers": [ "openembedded-core" ], | 68 | "defaultlayers": [ "openembedded-core" ], |
75 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | 69 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, |
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." | 70 | "helptext": "Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=jethro\">OpenEmbedded \"Jethro\"</a> branch" |
77 | }, | 71 | }, |
78 | { | 72 | { |
79 | "name": "fido", | 73 | "name": "fido", |
@@ -85,15 +79,6 @@ | |||
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" | 79 | "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" |
86 | }, | 80 | }, |
87 | { | 81 | { |
88 | "name": "dizzy", | ||
89 | "description": "OpenEmbedded Dizzy", | ||
90 | "bitbake": "dizzy", | ||
91 | "branch": "dizzy", | ||
92 | "defaultlayers": [ "openembedded-core" ], | ||
93 | "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 }, | ||
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" | ||
95 | }, | ||
96 | { | ||
97 | "name": "local", | 82 | "name": "local", |
98 | "description": "Local OpenEmbedded", | 83 | "description": "Local OpenEmbedded", |
99 | "bitbake": "HEAD", | 84 | "bitbake": "HEAD", |