diff options
author | Belen Barros Pena <belen.barros.pena@linux.intel.com> | 2016-07-15 13:58:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-22 14:12:34 +0100 |
commit | 6ea7b46ef6e4e7b552a799faed91cce7941a4285 (patch) | |
tree | c7c94f2c594f401aadd2ac08dd2724586f564ba1 /meta-poky | |
parent | 98c57bb512ea6790db8604fcf0b88c81651d2ab4 (diff) | |
download | poky-6ea7b46ef6e4e7b552a799faed91cce7941a4285.tar.gz |
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.
(From meta-yocto rev: 25a91ee63bad4771d0c867c04d13b6fcdf6a5417)
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>
Diffstat (limited to 'meta-poky')
-rw-r--r-- | meta-poky/conf/toasterconf.json | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json index 606aac7769..79f801bd4f 100644 --- a/meta-poky/conf/toasterconf.json +++ b/meta-poky/conf/toasterconf.json | |||
@@ -40,24 +40,18 @@ | |||
40 | "name": "OpenEmbedded", | 40 | "name": "OpenEmbedded", |
41 | "sourcetype": "layerindex", | 41 | "sourcetype": "layerindex", |
42 | "apiurl": "http://layers.openembedded.org/layerindex/api/", | 42 | "apiurl": "http://layers.openembedded.org/layerindex/api/", |
43 | "branches": ["master", "jethro", "krogoth"] | 43 | "branches": ["jethro", "krogoth"] |
44 | }, | 44 | }, |
45 | { | 45 | { |
46 | "name": "Imported layers", | 46 | "name": "Imported layers", |
47 | "sourcetype": "imported", | 47 | "sourcetype": "imported", |
48 | "apiurl": "", | 48 | "apiurl": "", |
49 | "branches": ["master", "jethro", "krogoth", "HEAD"] | 49 | "branches": ["jethro", "krogoth", "HEAD"] |
50 | 50 | ||
51 | } | 51 | } |
52 | ], | 52 | ], |
53 | "bitbake" : [ | 53 | "bitbake" : [ |
54 | { | 54 | { |
55 | "name": "master", | ||
56 | "giturl": "remote:origin", | ||
57 | "branch": "master", | ||
58 | "dirpath": "bitbake" | ||
59 | }, | ||
60 | { | ||
61 | "name": "jethro", | 55 | "name": "jethro", |
62 | "giturl": "remote:origin", | 56 | "giturl": "remote:origin", |
63 | "branch": "jethro", | 57 | "branch": "jethro", |
@@ -77,19 +71,10 @@ | |||
77 | } | 71 | } |
78 | ], | 72 | ], |
79 | 73 | ||
80 | "defaultrelease": "master", | 74 | "defaultrelease": "krogoth", |
81 | 75 | ||
82 | "releases": [ | 76 | "releases": [ |
83 | { | 77 | { |
84 | "name": "master", | ||
85 | "description": "Yocto Project master", | ||
86 | "bitbake": "master", | ||
87 | "branch": "master", | ||
88 | "defaultlayers": [ "openembedded-core", "meta-poky", "meta-yocto-bsp"], | ||
89 | "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, | ||
90 | "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." | ||
91 | }, | ||
92 | { | ||
93 | "name": "jethro", | 78 | "name": "jethro", |
94 | "description": "Yocto Project 2.0 Jethro", | 79 | "description": "Yocto Project 2.0 Jethro", |
95 | "bitbake": "jethro", | 80 | "bitbake": "jethro", |