diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2016-01-25 11:47:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-18 16:49:28 +0100 |
commit | b8e5de2b3313b91515a9165348b3e326610efe00 (patch) | |
tree | 45c4bde3804b41f79e99ddbae63a75406aca0df3 /meta-poky/conf | |
parent | c59771e175194b9ff845b9aee168a06028b259a5 (diff) | |
download | poky-b8e5de2b3313b91515a9165348b3e326610efe00.tar.gz |
toasterconf.json: Remove fido from supported configurations
It looks like the master branch will no longer build with the Fido
release, so remove all references to fido and make sure that the file
sets up local, master and jethro releases.
(From meta-yocto rev: a1955509f1f96b982f13a1e9ec0e4fd309e72a6b)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf')
-rw-r--r-- | meta-poky/conf/toasterconf.json | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/meta-poky/conf/toasterconf.json b/meta-poky/conf/toasterconf.json index 8153b7af3f..f74e2a008d 100644 --- a/meta-poky/conf/toasterconf.json +++ b/meta-poky/conf/toasterconf.json | |||
@@ -40,13 +40,13 @@ | |||
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" ,"fido"] | 43 | "branches": ["master", "jethro"] |
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","fido", "HEAD"] | 49 | "branches": ["master", "jethro", "HEAD"] |
50 | 50 | ||
51 | } | 51 | } |
52 | ], | 52 | ], |
@@ -64,12 +64,6 @@ | |||
64 | "dirpath": "bitbake" | 64 | "dirpath": "bitbake" |
65 | }, | 65 | }, |
66 | { | 66 | { |
67 | "name": "fido", | ||
68 | "giturl": "remote:origin", | ||
69 | "branch": "fido", | ||
70 | "dirpath": "bitbake" | ||
71 | }, | ||
72 | { | ||
73 | "name": "HEAD", | 67 | "name": "HEAD", |
74 | "giturl": "remote:origin", | 68 | "giturl": "remote:origin", |
75 | "branch": "HEAD", | 69 | "branch": "HEAD", |
@@ -99,15 +93,6 @@ | |||
99 | "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." | 93 | "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." |
100 | }, | 94 | }, |
101 | { | 95 | { |
102 | "name": "fido", | ||
103 | "description": "Yocto Project 1.8 Fido", | ||
104 | "bitbake": "fido", | ||
105 | "branch": "fido", | ||
106 | "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], | ||
107 | "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, | ||
108 | "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." | ||
109 | }, | ||
110 | { | ||
111 | "name": "local", | 96 | "name": "local", |
112 | "description": "Local Yocto Project", | 97 | "description": "Local Yocto Project", |
113 | "bitbake": "HEAD", | 98 | "bitbake": "HEAD", |