diff options
author | brian avery <avery.brian@gmail.com> | 2015-10-09 10:38:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-11 08:11:30 +0100 |
commit | d9528d9a394a45ecc2abb945cbffcf31b0078207 (patch) | |
tree | 98bfa701f72f128dcb34d84bbaf6e7dbc5715c7a /meta-yocto/conf | |
parent | 2d6701f19057ca6bb8c42705ffc83b0318d69e90 (diff) | |
download | openembedded-core-contrib-d9528d9a394a45ecc2abb945cbffcf31b0078207.tar.gz |
toasterconf: update meta-yocto to jethro and drop dizzy
Toaster only supports building 2 branches back. This
updates the conf file for meta-yocto to support
master, jethro, and fido.
(From meta-yocto rev: 426fb86b4c8ed5c700efe55176628cb0280cb3ae)
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r-- | meta-yocto/conf/toasterconf.json | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json index 9e45ff09ce..3df1703068 100644 --- a/meta-yocto/conf/toasterconf.json +++ b/meta-yocto/conf/toasterconf.json @@ -39,13 +39,13 @@ "name": "OpenEmbedded", "sourcetype": "layerindex", "apiurl": "http://layers.openembedded.org/layerindex/api/", - "branches": ["master", "fido", "dizzy"] + "branches": ["master", "jethro" ,"fido"] }, { "name": "Imported layers", "sourcetype": "imported", "apiurl": "", - "branches": ["master", "fido", "dizzy", "HEAD"] + "branches": ["master", "jethro","fido", "HEAD"] } ], @@ -57,15 +57,15 @@ "dirpath": "bitbake" }, { - "name": "fido", + "name": "jethro", "giturl": "remote:origin", - "branch": "fido", + "branch": "jethro", "dirpath": "bitbake" }, { - "name": "dizzy", + "name": "fido", "giturl": "remote:origin", - "branch": "dizzy", + "branch": "fido", "dirpath": "bitbake" }, { @@ -89,6 +89,15 @@ "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": "jethro", + "description": "Yocto Project 2.0 Jethro", + "bitbake": "jethro", + "branch": "jethro", + "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], + "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, + "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=jethro\">Yocto Project 2.0 \"Jethro\"</a> branch." + }, + { "name": "fido", "description": "Yocto Project 1.8 Fido", "bitbake": "fido", @@ -98,15 +107,6 @@ "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=fido\">Yocto Project 1.8 \"Fido\"</a> branch." }, { - "name": "dizzy", - "description": "Yocto Project 1.7 Dizzy", - "bitbake": "dizzy", - "branch": "dizzy", - "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], - "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, - "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=dizzy\">Yocto Project 1.7 \"Dizzy\"</a> branch." - }, - { "name": "local", "description": "Local Yocto Project", "bitbake": "HEAD", |