aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2015-03-25 14:14:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-29 23:07:15 +0100
commitf5af78cabb693692fa369730af4b0c70cca9bc91 (patch)
tree434e2b1a1251d06e036cda860b55f617062edfac
parentcbb64f85dabefe267519e4b983d73c864b41e876 (diff)
downloadopenembedded-core-f5af78cabb693692fa369730af4b0c70cca9bc91.zip
openembedded-core-f5af78cabb693692fa369730af4b0c70cca9bc91.tar.gz
openembedded-core-f5af78cabb693692fa369730af4b0c70cca9bc91.tar.bz2
toaster: update toasterconf.json for fido release
We update the toasterconf.json for the 1.8 "fido" release. A small update to the release help text in the toasterconf.json file shipped with the openembedded-core layer. We now make explicit that Toaster will build with the tip of the selected branch, and we add links to the OpenEmbedded repository. Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/toasterconf.json25
1 files changed, 20 insertions, 5 deletions
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
index aac478e..c8e42ef 100644
--- a/meta/conf/toasterconf.json
+++ b/meta/conf/toasterconf.json
@@ -12,7 +12,7 @@
"name": "Local OpenEmbedded",
"sourcetype": "local",
"apiurl": "../../",
- "branches": ["HEAD", "master", "dizzy"],
+ "branches": ["HEAD", "master", "fido", "dizzy"],
"layers": [
{
"name": "openembedded-core",
@@ -26,13 +26,13 @@
"name": "OpenEmbedded",
"sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/",
- "branches": ["master", "dizzy"]
+ "branches": ["master", "fido", "dizzy"]
},
{
"name": "Imported layers",
"sourcetype": "imported",
"apiurl": "",
- "branches": ["master", "dizzy", "HEAD"]
+ "branches": ["master", "fido", "dizzy", "HEAD"]
}
],
@@ -44,6 +44,12 @@
"dirpath": ""
},
{
+ "name": "fido",
+ "giturl": "git://git.openembedded.org/bitbake",
+ "branch": "1.26",
+ "dirpath": ""
+ },
+ {
"name": "dizzy",
"giturl": "git://git.openembedded.org/bitbake",
"branch": "1.24",
@@ -67,7 +73,16 @@
"branch": "master",
"defaultlayers": [ "openembedded-core" ],
"layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 },
- "helptext": "Toaster will run your builds using the OpenEmbedded master branch, where active development takes place. This is not a stable branch, so your builds might not work as expected."
+ "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",
+ "branch": "fido",
+ "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=fido\">OpenEmbedded \"Fido\"</a> branch"
},
{
"name": "dizzy",
@@ -76,7 +91,7 @@
"branch": "dizzy",
"defaultlayers": [ "openembedded-core" ],
"layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" : 0 },
- "helptext": "Toaster will run your builds with the OpenEmbedded Dizzy release"
+ "helptext": "Toaster will run your builds with the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=dizzy\">OpenEmbedded \"Dizzy\"</a> branch"
},
{
"name": "local",