aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-06-03 11:52:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 13:36:05 +0100
commitb0b91490e4ede61a302eb547da2cc65aa7da87ff (patch)
tree2370c41f6415793ff47b6f3aa070b97f640b43fa /meta/conf
parent350fd5d16888b3882b861ce955a3383e99420bd4 (diff)
downloadopenembedded-core-b0b91490e4ede61a302eb547da2cc65aa7da87ff.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. Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/toasterconf.json23
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 @@
"name": "Local OpenEmbedded",
"sourcetype": "local",
"apiurl": "../../",
- "branches": ["HEAD", "master", "jethro", "krogoth"],
+ "branches": ["HEAD", "jethro", "krogoth"],
"layers": [
{
"name": "openembedded-core",
@@ -27,24 +27,18 @@
"name": "OpenEmbedded",
"sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/",
- "branches": ["master", "jethro", "krogoth"]
+ "branches": ["jethro", "krogoth"]
},
{
"name": "Imported layers",
"sourcetype": "imported",
"apiurl": "",
- "branches": ["master", "jethro", "krogoth", "HEAD"]
+ "branches": ["jethro", "krogoth", "HEAD"]
}
],
"bitbake" : [
{
- "name": "master",
- "giturl": "git://git.openembedded.org/bitbake",
- "branch": "master",
- "dirpath": ""
- },
- {
"name": "jethro",
"giturl": "git://git.openembedded.org/bitbake",
"branch": "1.28",
@@ -64,19 +58,10 @@
}
],
- "defaultrelease": "master",
+ "defaultrelease": "krogoth",
"releases": [
{
- "name": "master",
- "description": "OpenEmbedded master",
- "bitbake": "master",
- "branch": "master",
- "defaultlayers": [ "openembedded-core" ],
- "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 },
- "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."
- },
- {
"name": "jethro",
"description": "OpenEmbedded Jethro",
"bitbake": "jethro",