Skip to contentSkip to conversation

toasterconf: remove master as a branch option from fido release

PATCH In review brian avery 2 participants 3 messages Aug 20, 2015 – Sep 1, 2015

lore
Share & tools
lore
#0 lore raw

cover toasterconf: remove master as a branch option from fido release

Toaster from FIDO can't reasonably be expected to be able to build master due to unforeseeable incompatibilities. This removes master branch as an option.

Alexandru DAMIAN (1):
toasterconf: remove master for fido

 meta/conf/toasterconf.json | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 toasterconf: remove master as a branch option from fido release

From: Alexandru DAMIAN <[email protected]>

Toaster isn't designed to be forward compatible. As such, a release cannot build releases newer then it.

Particularly, "fido" cannot build "master", so we remove "master" from the list of supported releases in "fido"

[YOCTO #8154]

---
 meta/conf/toasterconf.json | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
meta/conf/toasterconf.json +4 -19
index c8e42ef..ecd6a9f 100644
@@ -12,7 +12,7 @@
             "name": "Local OpenEmbedded",
             "sourcetype": "local",
             "apiurl": "../../",
-            "branches": ["HEAD", "master", "fido", "dizzy"],
+            "branches": ["HEAD", "fido", "dizzy"],
             "layers": [
                 {
                     "name": "openembedded-core",
@@ -26,24 +26,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": "git://git.openembedded.org/bitbake",
-            "branch": "master",
-            "dirpath": ""
-        },
-        {
             "name": "fido",
             "giturl": "git://git.openembedded.org/bitbake",
             "branch": "1.26",
@@ -63,19 +57,10 @@
         }
     ],
 
-    "defaultrelease": "master",
+    "defaultrelease": "fido",
 
     "releases": [
         {
-            "name": "master",
-            "description": "OpenEmbedded master",
-            "bitbake": "master",
-            "branch": "master",
-            "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."
-        },
-        {
             "name": "fido",
             "description": "OpenEmbedded Fido",
             "bitbake": "fido",
Signature · 1 line
1.9.1
#2 lore raw
Quoted 9 lines · brian avery

From: Alexandru DAMIAN <[email protected]>

Toaster isn't designed to be forward compatible. As such, a release cannot build releases newer then it.

Particularly, "fido" cannot build "master", so we remove "master" from the list of supported releases in "fido"

[YOCTO #8154]

Thanks Brian, this patch is queued in my fido-next branch[1].

Regards,

Joshua

1. http://cgit.openembedded.org/openembedded-core-contrib/log/?h=joshua
gl/fido-next

Quoted 77 lines
---
 meta/conf/toasterconf.json | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
meta/conf/toasterconf.json +3 -9
index c8e42ef..ecd6a9f 100644
@@ -12,7 +12,7 @@
             "name": "Local OpenEmbedded",
             "sourcetype": "local",
             "apiurl": "../../",
-            "branches": ["HEAD", "master", "fido", "dizzy"],
+            "branches": ["HEAD", "fido", "dizzy"],
             "layers": [
                 {
                     "name": "openembedded-core",
@@ -26,24 +26,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": "git://git.openembedded.org/bitbake",
-            "branch": "master",
-            "dirpath": ""
-        },
-        {
             "name": "fido",
             "giturl": "git://git.openembedded.org/bitbake",
             "branch": "1.26",
meta/conf/toasterconf.json +1 -8
@@ -63,19 +57,10 @@
         }
     ],
 
-    "defaultrelease": "master",
+    "defaultrelease": "fido",
 
     "releases": [
         {
-            "name": "master",
-            "description": "OpenEmbedded master",
-            "bitbake": "master",
-            "branch": "master",
-            "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 ma ster</a> branch, where active development takes place. This is not a stable branch, so your builds might not work as expected."

meta/conf/toasterconf.json +0 -2
-        },
-        {
             "name": "fido",
             "description": "OpenEmbedded Fido",
             "bitbake": "fido",
Signature · 1 line
1.9.1