diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-08-20 16:04:55 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 21:19:46 +0100 |
| commit | bdba0dd12dcca168e4721088414b47e411b0ef16 (patch) | |
| tree | 226dfb86c4fac9bcfb0567535680ebdf54dd4535 /meta | |
| parent | 4fc8836379b3a4534c392a29b4bf70000b632232 (diff) | |
| download | ast2050-yocto-poky-bdba0dd12dcca168e4721088414b47e411b0ef16.zip ast2050-yocto-poky-bdba0dd12dcca168e4721088414b47e411b0ef16.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 OE-Core rev: bda086118abfb168183dc285357ecbb6dccff5e3)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/toasterconf.json | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json index c8e42ef..ecd6a9f 100644 --- a/meta/conf/toasterconf.json +++ b/meta/conf/toasterconf.json @@ -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", |
