summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2016-07-15 13:58:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-22 14:12:23 +0100
commit25a91ee63bad4771d0c867c04d13b6fcdf6a5417 (patch)
treee47781c46674d26b76468ff65f2a14e28a2dc587
parent19c53669baf39ef793b3fb8f0e01345e450f1f78 (diff)
downloadmeta-yocto-25a91ee63bad4771d0c867c04d13b6fcdf6a5417.tar.gz
meta-yocto-25a91ee63bad4771d0c867c04d13b6fcdf6a5417.tar.bz2
meta-yocto-25a91ee63bad4771d0c867c04d13b6fcdf6a5417.zip
toaster: toasterconf.json Remove master release
With the move to python3 completed in master, Toaster 2.1 no longer builds the master branch. This patch removes the master release from the Yocto Project toaster configuration file so that the master branch is not listed as an option to select when creating a project. Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/conf/toasterconf.json21
1 files changed, 3 insertions, 18 deletions
diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json
index 606aac7..79f801b 100644
--- a/meta-poky/conf/toasterconf.json
+++ b/meta-poky/conf/toasterconf.json
@@ -40,24 +40,18 @@
"name": "OpenEmbedded",
"sourcetype": "layerindex",
"apiurl": "http://layers.openembedded.org/layerindex/api/",
- "branches": ["master", "jethro", "krogoth"]
+ "branches": ["jethro", "krogoth"]
},
{
"name": "Imported layers",
"sourcetype": "imported",
"apiurl": "",
- "branches": ["master", "jethro", "krogoth", "HEAD"]
+ "branches": ["jethro", "krogoth", "HEAD"]
}
],
"bitbake" : [
{
- "name": "master",
- "giturl": "remote:origin",
- "branch": "master",
- "dirpath": "bitbake"
- },
- {
"name": "jethro",
"giturl": "remote:origin",
"branch": "jethro",
@@ -77,19 +71,10 @@
}
],
- "defaultrelease": "master",
+ "defaultrelease": "krogoth",
"releases": [
{
- "name": "master",
- "description": "Yocto Project master",
- "bitbake": "master",
- "branch": "master",
- "defaultlayers": [ "openembedded-core", "meta-poky", "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": "jethro",
"description": "Yocto Project 2.0 Jethro",
"bitbake": "jethro",