From: Belen Barros Pena <belen.barros.pena@intel.com>
Date: Mon, 25 Jan 2016 10:47:37 +0000 (+0100)
Subject: toasterconf.json: Remove fido from supported configurations
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1955509f1f96b982f13a1e9ec0e4fd309e72a6b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json
index 8153b7af3f4..f74e2a008d3 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"]
 
         }
     ],
@@ -63,12 +63,6 @@
             "branch": "jethro",
             "dirpath": "bitbake"
         },
-        {
-            "name": "fido",
-            "giturl": "remote:origin",
-            "branch": "fido",
-            "dirpath": "bitbake"
-        },
         {
             "name": "HEAD",
             "giturl": "remote:origin",
@@ -98,15 +92,6 @@
             "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=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",