aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2016-01-25 11:47:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:49:28 +0100
commitd0bce0b74ac0feff9a3030fa49b24d957444be40 (patch)
tree81cb37d111dfaaec72ae51c6265b7f0355d53e4b
parentd25eea31121085ec4fe51c3cb8ce472bc2b8339b (diff)
downloadopenembedded-core-contrib-d0bce0b74ac0feff9a3030fa49b24d957444be40.tar.gz
openembedded-core-contrib-d0bce0b74ac0feff9a3030fa49b24d957444be40.tar.bz2
openembedded-core-contrib-d0bce0b74ac0feff9a3030fa49b24d957444be40.zip
toasterconf.json: Remove fido from supported configurations
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. (From OE-Core rev: ce9bf86dd9747058e96b804826a7b05a4ec85f52) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 40a4db6fe34..3ce59b73693 100644
--- a/meta/conf/toasterconf.json
+++ b/meta/conf/toasterconf.json
@@ -13,7 +13,7 @@
"name": "Local OpenEmbedded",
"sourcetype": "local",
"apiurl": "../../",
- "branches": ["HEAD", "master", "fido", "dizzy"],
+ "branches": ["HEAD", "master", "jethro"],
"layers": [
{
"name": "openembedded-core",
@@ -27,13 +27,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"]
}
],
@@ -45,15 +45,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": ""
},
{
@@ -77,22 +71,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",