summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2016-01-25 11:47:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:49:28 +0100
commitb8e5de2b3313b91515a9165348b3e326610efe00 (patch)
tree45c4bde3804b41f79e99ddbae63a75406aca0df3
parentc59771e175194b9ff845b9aee168a06028b259a5 (diff)
downloadopenembedded-core-contrib-b8e5de2b3313b91515a9165348b3e326610efe00.tar.gz
openembedded-core-contrib-b8e5de2b3313b91515a9165348b3e326610efe00.tar.bz2
openembedded-core-contrib-b8e5de2b3313b91515a9165348b3e326610efe00.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 meta-yocto rev: a1955509f1f96b982f13a1e9ec0e4fd309e72a6b) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/conf/toasterconf.json19
1 files changed, 2 insertions, 17 deletions
diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json
index 8153b7af3f..f74e2a008d 100644
--- a/meta-poky/conf/toasterconf.json
+++ b/meta-poky/conf/toasterconf.json
@@ -40,13 +40,13 @@
"name": "OpenEmbedded",
"sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/",
- "branches": ["master", "jethro" ,"fido"]
+ "branches": ["master", "jethro"]
},
{
"name": "Imported layers",
"sourcetype": "imported",
"apiurl": "",
- "branches": ["master", "jethro","fido", "HEAD"]
+ "branches": ["master", "jethro", "HEAD"]
}
],
@@ -64,12 +64,6 @@
"dirpath": "bitbake"
},
{
- "name": "fido",
- "giturl": "remote:origin",
- "branch": "fido",
- "dirpath": "bitbake"
- },
- {
"name": "HEAD",
"giturl": "remote:origin",
"branch": "HEAD",
@@ -99,15 +93,6 @@
"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."
},
{
- "name": "fido",
- "description": "Yocto Project 1.8 Fido",
- "bitbake": "fido",
- "branch": "fido",
- "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"],
- "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 },
- "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\">Yocto Project 1.8 \"Fido\"</a> branch."
- },
- {
"name": "local",
"description": "Local Yocto Project",
"bitbake": "HEAD",