summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2016-01-25 11:47:36 +0100
committerMichael Wood <michael.g.wood@intel.com>2016-02-10 14:28:15 +0000
commit05f6504e1cac7e37a96e116d40624641ec479b1f (patch)
tree16bb6da26ff4f231763dfa579e92101e40b39b53
parentade0802314bf443b2e007fa59d4561e91dbdd6ed (diff)
downloadpoky-contrib-05f6504e1cac7e37a96e116d40624641ec479b1f.tar.gz
poky-contrib-05f6504e1cac7e37a96e116d40624641ec479b1f.tar.bz2
poky-contrib-05f6504e1cac7e37a96e116d40624641ec479b1f.zip
toaster: update the openembedded-core toaster configuration file
It looks like the master branch will no longer build with the Fido release, so remove all references to fido and make sure that the file sets up local, master and jethro releases. Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
-rw-r--r--meta/conf/toasterconf.json35
1 files changed, 10 insertions, 25 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
index 1987793b89..2f451f3a96 100644
--- a/meta/conf/toasterconf.json
+++ b/meta/conf/toasterconf.json
@@ -11,7 +11,7 @@
"name": "Local OpenEmbedded",
"sourcetype": "local",
"apiurl": "../../",
- "branches": ["HEAD", "master", "fido", "dizzy"],
+ "branches": ["HEAD", "master", "jethro"],
"layers": [
{
"name": "openembedded-core",
@@ -25,13 +25,13 @@
"name": "OpenEmbedded",
"sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/",
- "branches": ["master", "fido", "dizzy"]
+ "branches": ["master", "jethro"]
},
{
"name": "Imported layers",
"sourcetype": "imported",
"apiurl": "",
- "branches": ["master", "fido", "dizzy", "HEAD"]
+ "branches": ["master", "jethro", "HEAD"]
}
],
@@ -43,15 +43,9 @@
"dirpath": ""
},
{
- "name": "fido",
+ "name": "jethro",
"giturl": "git://git.openembedded.org/bitbake",
- "branch": "1.26",
- "dirpath": ""
- },
- {
- "name": "dizzy",
- "giturl": "git://git.openembedded.org/bitbake",
- "branch": "1.24",
+ "branch": "1.28",
"dirpath": ""
},
{
@@ -75,22 +69,13 @@
"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": "fido",
- "description": "OpenEmbedded Fido",
- "bitbake": "fido",
- "branch": "fido",
- "defaultlayers": [ "openembedded-core" ],
- "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 },
- "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"
- },
- {
- "name": "dizzy",
- "description": "OpenEmbedded Dizzy",
- "bitbake": "dizzy",
- "branch": "dizzy",
+ "name": "jethro",
+ "description": "OpenEmbedded Jethro",
+ "bitbake": "jethro",
+ "branch": "jethro",
"defaultlayers": [ "openembedded-core" ],
"layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 },
- "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"
+ "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"
},
{
"name": "local",