Skip to contentSkip to conversation

: remove master branch from toasterconf for fido

PATCH New brian avery 1 participant 2 messages Nov 1, 2015

lore
Share & tools
lore

brian avery

author
#0 lore raw

cover : remove master branch from toasterconf for fido

This is the second part required to fix bug 8154. The fix for meta/conf/toasterconf.json went in a while ago. This fixes meta-yocto/conf/toasterconf.json.

This is a backport to fido.

-b

The following changes since commit fa55b8e5050c6d7a47ef8e9bc213d0cc9471b43a:

bitbake: toaster: buildinfohelper Skip packages we have no build info about (2015-10-24 12:01:07 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib bavery/toaster/fido-8154
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/toaster/fido-8154

brian avery (1):
toasterconf: remove master as a branch option from fido release

 meta-yocto/conf/toasterconf.json | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

--
1.9.1

author
#1 lore raw

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

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]

Signed-off-by brian avery <[email protected]>
---
 meta-yocto/conf/toasterconf.json | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
meta-yocto/conf/toasterconf.json +4 -19
index c455276..264b70b 100644
@@ -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",
Signature · 1 line
1.9.1