summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-yocto/conf/toasterconf.json23
1 files changed, 4 insertions, 19 deletions
diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json
index c455276266..264b70b4a5 100644
--- a/meta-yocto/conf/toasterconf.json
+++ b/meta-yocto/conf/toasterconf.json
@@ -12,7 +12,7 @@
12 "name": "Local Yocto Project", 12 "name": "Local Yocto Project",
13 "sourcetype": "local", 13 "sourcetype": "local",
14 "apiurl": "../../", 14 "apiurl": "../../",
15 "branches": ["HEAD", "master", "fido", "dizzy"], 15 "branches": ["HEAD", "fido", "dizzy"],
16 "layers": [ 16 "layers": [
17 { 17 {
18 "name": "openembedded-core", 18 "name": "openembedded-core",
@@ -39,24 +39,18 @@
39 "name": "OpenEmbedded", 39 "name": "OpenEmbedded",
40 "sourcetype": "layerindex", 40 "sourcetype": "layerindex",
41 "apiurl": "http://layers.openembedded.org/layerindex/api/", 41 "apiurl": "http://layers.openembedded.org/layerindex/api/",
42 "branches": ["master", "fido", "dizzy"] 42 "branches": ["fido", "dizzy"]
43 }, 43 },
44 { 44 {
45 "name": "Imported layers", 45 "name": "Imported layers",
46 "sourcetype": "imported", 46 "sourcetype": "imported",
47 "apiurl": "", 47 "apiurl": "",
48 "branches": ["master", "fido", "dizzy", "HEAD"] 48 "branches": ["fido", "dizzy", "HEAD"]
49 49
50 } 50 }
51 ], 51 ],
52 "bitbake" : [ 52 "bitbake" : [
53 { 53 {
54 "name": "master",
55 "giturl": "remote:origin",
56 "branch": "master",
57 "dirpath": "bitbake"
58 },
59 {
60 "name": "fido", 54 "name": "fido",
61 "giturl": "remote:origin", 55 "giturl": "remote:origin",
62 "branch": "fido", 56 "branch": "fido",
@@ -76,19 +70,10 @@
76 } 70 }
77 ], 71 ],
78 72
79 "defaultrelease": "master", 73 "defaultrelease": "fido",
80 74
81 "releases": [ 75 "releases": [
82 { 76 {
83 "name": "master",
84 "description": "Yocto Project master",
85 "bitbake": "master",
86 "branch": "master",
87 "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
88 "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
89 "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."
90 },
91 {
92 "name": "fido", 77 "name": "fido",
93 "description": "Yocto Project 1.8 Fido", 78 "description": "Yocto Project 1.8 Fido",
94 "bitbake": "fido", 79 "bitbake": "fido",