[PATCH] toaster: update meta-yocto to jethro and drop dizzy

[PATCH] toaster: update meta-yocto to jethro and drop dizzy

[Elliot Smith]

From: brian avery <avery.brian@gmail.com>

Toaster only supports building 2 branches back. This
updates the conf file for meta-yocto to support
master, jethro, and fido.

Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 meta-yocto/conf/toasterconf.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json
index 9e45ff0..3df1703 100644
--- a/meta-yocto/conf/toasterconf.json
+++ b/meta-yocto/conf/toasterconf.json
@@ -39,13 +39,13 @@
             "name": "OpenEmbedded",
             "sourcetype": "layerindex",
             "apiurl": "http://layers.openembedded.org/layerindex/api/",
-            "branches": ["master", "fido", "dizzy"]
+            "branches": ["master", "jethro" ,"fido"]
         },
         {
             "name": "Imported layers",
             "sourcetype": "imported",
             "apiurl": "",
-            "branches": ["master", "fido", "dizzy", "HEAD"]
+            "branches": ["master", "jethro","fido", "HEAD"]
 
         }
     ],
@@ -57,15 +57,15 @@
             "dirpath": "bitbake"
         },
         {
-            "name": "fido",
+            "name": "jethro",
             "giturl": "remote:origin",
-            "branch": "fido",
+            "branch": "jethro",
             "dirpath": "bitbake"
         },
         {
-            "name": "dizzy",
+            "name": "fido",
             "giturl": "remote:origin",
-            "branch": "dizzy",
+            "branch": "fido",
             "dirpath": "bitbake"
         },
         {
@@ -89,6 +89,15 @@
             "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",
+            "bitbake": "jethro",
+            "branch": "jethro",
+            "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=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch."
+        },
+        {
             "name": "fido",
             "description": "Yocto Project 1.8 Fido",
             "bitbake": "fido",
@@ -98,15 +107,6 @@
             "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": "dizzy",
-            "description": "Yocto Project 1.7 Dizzy",
-            "bitbake": "dizzy",
-            "branch": "dizzy",
-            "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=dizzy\">Yocto Project 1.7 \"Dizzy\"</a> branch."
-        },
-        {
             "name": "local",
             "description": "Local Yocto Project",
             "bitbake": "HEAD",
-- 
1.9.3

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [PATCH] toaster: update meta-yocto to jethro and drop dizzy

[Richard Purdie]

On Fri, 2015-10-09 at 10:38 +0100, Elliot Smith wrote:
> From: brian avery <avery.brian@gmail.com>
> 
> Toaster only supports building 2 branches back. This
> updates the conf file for meta-yocto to support
> master, jethro, and fido.
> 
> Signed-off-by: brian avery <avery.brian@gmail.com>
> Signed-off-by: Elliot Smith <elliot.smith@intel.com>
> ---
>  meta-yocto/conf/toasterconf.json | 30 +++++++++++++++---------------
>  1 file changed, 15 insertions(+), 15 deletions(-)

This should actually go to the poky list and say something like
"toasterconf:" in the subject rather than "toaster:" however I've sorted
this out in this case.

Cheers,

Richard

Re: [PATCH] toaster: update meta-yocto to jethro and drop dizzy

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 946 bytes --]

On 11 October 2015 at 08:12, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Fri, 2015-10-09 at 10:38 +0100, Elliot Smith wrote:
> > From: brian avery <avery.brian@gmail.com>
> >
> > Toaster only supports building 2 branches back. This
> > updates the conf file for meta-yocto to support
> > master, jethro, and fido.
> >
> > Signed-off-by: brian avery <avery.brian@gmail.com>
> > Signed-off-by: Elliot Smith <elliot.smith@intel.com>
> > ---
> >  meta-yocto/conf/toasterconf.json | 30 +++++++++++++++---------------
> >  1 file changed, 15 insertions(+), 15 deletions(-)
>
> This should actually go to the poky list and say something like
> "toasterconf:" in the subject rather than "toaster:" however I've sorted
> this out in this case.
>

Thanks Richard. I'll be more attentive to the commit subject line in future.

Elliot

-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 1614 bytes --]