[Toaster] [PATCH] [fido] toaster: Remove the master release from conf file

[Barros Pena, Belen]

Please ignore this patch: there is only already in the poky mailing list.
Didn't realise that.

Cheers

Belén

On 04/11/2015 11:02, "toaster-bounces at yoctoproject.org on behalf of Belen
Barros Pena" <toaster-bounces at yoctoproject.org on behalf of
belen.barros.pena at linux.intel.com> wrote:

>From: Belen Barros Pena <belen.barros.pena at intel.com>
>
>We can no longer guarantee the Fido release will build
>current master, so removing the master release from the
>toasterconf.json file we ship with the meta-yocto layer
>in the Fido branch.
>
>[YOCTO #8154]
>
>Signed-off-by: Belen Barros Pena <belen.barros.pena at intel.com>
>---
> meta-yocto/conf/toasterconf.json | 23 ++++-------------------
> 1 file changed, 4 insertions(+), 19 deletions(-)
>
>diff --git a/meta-yocto/conf/toasterconf.json
>b/meta-yocto/conf/toasterconf.json
>index c455276..264b70b 100644
>--- a/meta-yocto/conf/toasterconf.json
>+++ b/meta-yocto/conf/toasterconf.json
>@@ -12,7 +12,7 @@
>             "name": "Local Yocto Project",
>             "sourcetype": "local",
>             "apiurl": "../../",
>-            "branches": ["HEAD", "master", "fido", "dizzy"],
>+            "branches": ["HEAD", "fido", "dizzy"],
>             "layers": [
>                 {
>                     "name": "openembedded-core",
>@@ -39,24 +39,18 @@
>             "name": "OpenEmbedded",
>             "sourcetype": "layerindex",
>             "apiurl": "http://layers.openembedded.org/layerindex/api/",
>-            "branches": ["master", "fido", "dizzy"]
>+            "branches": ["fido", "dizzy"]
>         },
>         {
>             "name": "Imported layers",
>             "sourcetype": "imported",
>             "apiurl": "",
>-            "branches": ["master", "fido", "dizzy", "HEAD"]
>+            "branches": ["fido", "dizzy", "HEAD"]
> 
>         }
>     ],
>     "bitbake" : [
>         {
>-            "name": "master",
>-            "giturl": "remote:origin",
>-            "branch": "master",
>-            "dirpath": "bitbake"
>-        },
>-        {
>             "name": "fido",
>             "giturl": "remote:origin",
>             "branch": "fido",
>@@ -76,19 +70,10 @@
>         }
>     ],
> 
>-    "defaultrelease": "master",
>+    "defaultrelease": "fido",
> 
>     "releases": [
>         {
>-            "name": "master",
>-            "description": "Yocto Project master",
>-            "bitbake": "master",
>-            "branch": "master",
>-            "defaultlayers": [ "openembedded-core", "meta-yocto",
>"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": "fido",
>             "description": "Yocto Project 1.8 Fido",
>             "bitbake": "fido",
>-- 
>2.4.9 (Apple Git-60)
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster at yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster