diff options
| author | brian avery <avery.brian@gmail.com> | 2015-11-01 13:24:24 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 13:28:14 +0000 |
| commit | aff2257e0b1153814aefc96737e00bdb4cf634e0 (patch) | |
| tree | a6987370ca90d32531896025941d469341213c07 /meta-yocto | |
| parent | 118acdcf67ff1d17210834d9f3c8bfe3361810a8 (diff) | |
| download | ast2050-yocto-poky-aff2257e0b1153814aefc96737e00bdb4cf634e0.zip ast2050-yocto-poky-aff2257e0b1153814aefc96737e00bdb4cf634e0.tar.gz | |
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]
(From meta-yocto rev: e12c4cf27ccdf3f93035a8450b5ff62fe4fe9838)
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
| -rw-r--r-- | meta-yocto/conf/toasterconf.json | 23 |
1 files 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", |
