aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-06-03 14:59:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 15:02:01 +0100
commitb96683079fc481080ba7b49731bec697b43edae8 (patch)
tree567495e6ffc2d776d440afb4c745cc98a4e040b1
parent0eadd008d08f9a6bb17a1f641b4735d0d2012580 (diff)
downloadopenembedded-core-contrib-b96683079fc481080ba7b49731bec697b43edae8.tar.gz
toasterconf.json: exclude releases Toaster can't build
Due to the switch to Python 3, Toaster master can only build with master and not with earlier releases. Make master the default release for projects and remove previous releases from configuration. Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/toasterconf.json36
1 files changed, 3 insertions, 33 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
index c27880e109..796125bbfd 100644
--- a/meta/conf/toasterconf.json
+++ b/meta/conf/toasterconf.json
@@ -13,7 +13,7 @@
"name": "Local OpenEmbedded",
"sourcetype": "local",
"apiurl": "../../",
- "branches": ["HEAD", "master", "jethro", "krogoth"],
+ "branches": ["HEAD", "master"],
"layers": [
{
"name": "openembedded-core",
@@ -27,13 +27,13 @@
"name": "OpenEmbedded",
"sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/",
- "branches": ["master", "jethro", "krogoth"]
+ "branches": ["master"]
},
{
"name": "Imported layers",
"sourcetype": "imported",
"apiurl": "",
- "branches": ["master", "jethro", "krogoth", "HEAD"]
+ "branches": ["master", "HEAD"]
}
],
@@ -45,18 +45,6 @@
"dirpath": ""
},
{
- "name": "jethro",
- "giturl": "git://git.openembedded.org/bitbake",
- "branch": "1.28",
- "dirpath": ""
- },
- {
- "name": "krogoth",
- "giturl": "git://git.openembedded.org/bitbake",
- "branch": "1.30",
- "dirpath": ""
- },
- {
"name": "HEAD",
"giturl": "git://git.openembedded.org/bitbake",
"branch": "HEAD",
@@ -77,24 +65,6 @@
"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": "jethro",
- "description": "OpenEmbedded Jethro",
- "bitbake": "jethro",
- "branch": "jethro",
- "defaultlayers": [ "openembedded-core" ],
- "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 },
- "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=jethro\">OpenEmbedded \"Jethro\"</a> branch"
- },
- {
- "name": "krogoth",
- "description": "OpenEmbedded Krogoth",
- "bitbake": "krogoth",
- "branch": "krogoth",
- "defaultlayers": [ "openembedded-core" ],
- "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 },
- "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=krogoth\">OpenEmbedded \"Krogoth\"</a> branch"
- },
- {
"name": "local",
"description": "Local OpenEmbedded",
"bitbake": "HEAD",