summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-06-17 11:32:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-23 14:26:01 +0100
commit1096a95897554afe96c6e5acba3f09df4a1ab45a (patch)
tree215de0b61e40e22fd114aaeabad54d8458cc7bb5 /meta-poky
parent5e866822a421877614a982a202106333c28d1869 (diff)
downloadpoky-1096a95897554afe96c6e5acba3f09df4a1ab45a.tar.gz
toasterconf: 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. Removed references to "jethro" and "krogoth" from toasterconf. (From meta-yocto rev: dc458077de015ce5e66ab7c95d67238ae348e494) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky')
-rw-r--r--meta-poky/conf/toasterconf.json34
1 files changed, 2 insertions, 32 deletions
diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json
index 606aac7769..93fb9291f9 100644
--- a/meta-poky/conf/toasterconf.json
+++ b/meta-poky/conf/toasterconf.json
@@ -40,13 +40,13 @@
40 "name": "OpenEmbedded", 40 "name": "OpenEmbedded",
41 "sourcetype": "layerindex", 41 "sourcetype": "layerindex",
42 "apiurl": "http://layers.openembedded.org/layerindex/api/", 42 "apiurl": "http://layers.openembedded.org/layerindex/api/",
43 "branches": ["master", "jethro", "krogoth"] 43 "branches": ["master"]
44 }, 44 },
45 { 45 {
46 "name": "Imported layers", 46 "name": "Imported layers",
47 "sourcetype": "imported", 47 "sourcetype": "imported",
48 "apiurl": "", 48 "apiurl": "",
49 "branches": ["master", "jethro", "krogoth", "HEAD"] 49 "branches": ["master", "HEAD"]
50 50
51 } 51 }
52 ], 52 ],
@@ -58,18 +58,6 @@
58 "dirpath": "bitbake" 58 "dirpath": "bitbake"
59 }, 59 },
60 { 60 {
61 "name": "jethro",
62 "giturl": "remote:origin",
63 "branch": "jethro",
64 "dirpath": "bitbake"
65 },
66 {
67 "name": "krogoth",
68 "giturl": "remote:origin",
69 "branch": "krogoth",
70 "dirpath": "bitbake"
71 },
72 {
73 "name": "HEAD", 61 "name": "HEAD",
74 "giturl": "remote:origin", 62 "giturl": "remote:origin",
75 "branch": "HEAD", 63 "branch": "HEAD",
@@ -90,24 +78,6 @@
90 "helptext": "Toaster will run your builds using the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\">Yocto Project master branch</a>, where active development takes place. This is not a stable branch, so your builds might not work as expected." 78 "helptext": "Toaster will run your builds using the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/\">Yocto Project master branch</a>, where active development takes place. This is not a stable branch, so your builds might not work as expected."
91 }, 79 },
92 { 80 {
93 "name": "jethro",
94 "description": "Yocto Project 2.0 Jethro",
95 "bitbake": "jethro",
96 "branch": "jethro",
97 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
98 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
99 "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch."
100 },
101 {
102 "name": "krogoth",
103 "description": "Yocto Project 2.1 Krogoth",
104 "bitbake": "krogoth",
105 "branch": "krogoth",
106 "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
107 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
108 "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=krogoth\">Yocto Project 2.1 \"Krogoth\"</a> branch."
109 },
110 {
111 "name": "local", 81 "name": "local",
112 "description": "Local Yocto Project", 82 "description": "Local Yocto Project",
113 "bitbake": "HEAD", 83 "bitbake": "HEAD",