toasterconf.json: exclude releases Toaster can't build

Due to changes in master to support Python 3, Toaster is no
longer able to build from master.

Remove references to master and set default release to jethro.

The dizzy release should also be removed, as Toaster jethro
is unable to build using this release.

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
index c8e42efadd635a9b56163b7514ab0c3e99b05f93..8a17ee6a09217fd85bf0d2dc765edd09af35f83b 100644 (file)
--- a/meta/conf/toasterconf.json
+++ b/meta/conf/toasterconf.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "MACHINE"      : "qemux86",
-        "DISTRO"       : "poky",
+        "DISTRO"       : "nodistro",
         "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2",
         "IMAGE_INSTALL_append": "",
         "PACKAGE_CLASSES": "package_rpm",
@@ -12,7 +12,7 @@
             "name": "Local OpenEmbedded",
             "sourcetype": "local",
             "apiurl": "../../",
-            "branches": ["HEAD", "master", "fido", "dizzy"],
+            "branches": ["HEAD", "jethro", "fido"],
             "layers": [
                 {
                     "name": "openembedded-core",
@@ -26,21 +26,21 @@
             "name": "OpenEmbedded",
             "sourcetype": "layerindex",
             "apiurl": "http://layers.openembedded.org/layerindex/api/",
-            "branches": ["master", "fido", "dizzy"]
+            "branches": ["jethro", "fido"]
         },
         {
             "name": "Imported layers",
             "sourcetype": "imported",
             "apiurl": "",
-            "branches": ["master", "fido", "dizzy", "HEAD"]
+            "branches": ["jethro", "fido", "HEAD"]
 
         }
     ],
     "bitbake" : [
         {
-            "name": "master",
+            "name": "jethro",
             "giturl": "git://git.openembedded.org/bitbake",
-            "branch": "master",
+            "branch": "1.28",
             "dirpath": ""
         },
         {
@@ -49,12 +49,6 @@
             "branch": "1.26",
             "dirpath": ""
         },
-        {
-            "name": "dizzy",
-            "giturl": "git://git.openembedded.org/bitbake",
-            "branch": "1.24",
-            "dirpath": ""
-        },
         {
             "name": "HEAD",
             "giturl": "git://git.openembedded.org/bitbake",
@@ -63,17 +57,17 @@
         }
     ],
 
-    "defaultrelease": "master",
+    "defaultrelease": "jethro",
 
     "releases": [
         {
-            "name": "master",
-            "description": "OpenEmbedded master",
-            "bitbake": "master",
-            "branch": "master",
+            "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 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."
+            "helptext": "Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=jethro\">OpenEmbedded \"Jethro\"</a> branch"
         },
         {
             "name": "fido",
@@ -84,15 +78,6 @@
             "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",
-            "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"
-        },
         {
             "name": "local",
             "description": "Local OpenEmbedded",