From 6ea7b46ef6e4e7b552a799faed91cce7941a4285 Mon Sep 17 00:00:00 2001
From: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Date: Fri, 15 Jul 2016 13:58:44 +0100
Subject: toaster: toasterconf.json Remove master release

With the move to python3 completed in master, Toaster 2.1 no longer
builds the master branch. This patch removes the master release from the
Yocto Project toaster configuration file so that the master branch is
not listed as an option to select when creating a project.

(From meta-yocto rev: 25a91ee63bad4771d0c867c04d13b6fcdf6a5417)

Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-poky/conf/toasterconf.json | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'meta-poky/conf')

diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json
index 606aac7769..79f801bd4f 100644
--- a/meta-poky/conf/toasterconf.json
+++ b/meta-poky/conf/toasterconf.json
@@ -40,23 +40,17 @@
             "name": "OpenEmbedded",
             "sourcetype": "layerindex",
             "apiurl": "http://layers.openembedded.org/layerindex/api/",
-            "branches": ["master", "jethro", "krogoth"]
+            "branches": ["jethro", "krogoth"]
         },
         {
             "name": "Imported layers",
             "sourcetype": "imported",
             "apiurl": "",
-            "branches": ["master", "jethro", "krogoth", "HEAD"]
+            "branches": ["jethro", "krogoth", "HEAD"]
 
         }
     ],
     "bitbake" : [
-        {
-            "name": "master",
-            "giturl": "remote:origin",
-            "branch": "master",
-            "dirpath": "bitbake"
-        },
         {
             "name": "jethro",
             "giturl": "remote:origin",
@@ -77,18 +71,9 @@
         }
     ],
 
-    "defaultrelease": "master",
+    "defaultrelease": "krogoth",
 
     "releases": [
-        {
-            "name": "master",
-            "description": "Yocto Project master",
-            "bitbake": "master",
-            "branch": "master",
-            "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"],
-            "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" :  0 },
-            "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."
-        },
         {
             "name": "jethro",
             "description": "Yocto Project 2.0 Jethro",
-- 
cgit v1.2.3-54-g00ecf