diff options
author | brian avery <avery.brian@gmail.com> | 2015-10-09 10:38:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-11 08:11:30 +0100 |
commit | d9528d9a394a45ecc2abb945cbffcf31b0078207 (patch) | |
tree | 98bfa701f72f128dcb34d84bbaf6e7dbc5715c7a | |
parent | 2d6701f19057ca6bb8c42705ffc83b0318d69e90 (diff) | |
download | poky-d9528d9a394a45ecc2abb945cbffcf31b0078207.tar.gz |
toasterconf: update meta-yocto to jethro and drop dizzy
Toaster only supports building 2 branches back. This
updates the conf file for meta-yocto to support
master, jethro, and fido.
(From meta-yocto rev: 426fb86b4c8ed5c700efe55176628cb0280cb3ae)
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-yocto/conf/toasterconf.json | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json index 9e45ff09ce..3df1703068 100644 --- a/meta-yocto/conf/toasterconf.json +++ b/meta-yocto/conf/toasterconf.json | |||
@@ -39,13 +39,13 @@ | |||
39 | "name": "OpenEmbedded", | 39 | "name": "OpenEmbedded", |
40 | "sourcetype": "layerindex", | 40 | "sourcetype": "layerindex", |
41 | "apiurl": "http://layers.openembedded.org/layerindex/api/", | 41 | "apiurl": "http://layers.openembedded.org/layerindex/api/", |
42 | "branches": ["master", "fido", "dizzy"] | 42 | "branches": ["master", "jethro" ,"fido"] |
43 | }, | 43 | }, |
44 | { | 44 | { |
45 | "name": "Imported layers", | 45 | "name": "Imported layers", |
46 | "sourcetype": "imported", | 46 | "sourcetype": "imported", |
47 | "apiurl": "", | 47 | "apiurl": "", |
48 | "branches": ["master", "fido", "dizzy", "HEAD"] | 48 | "branches": ["master", "jethro","fido", "HEAD"] |
49 | 49 | ||
50 | } | 50 | } |
51 | ], | 51 | ], |
@@ -57,15 +57,15 @@ | |||
57 | "dirpath": "bitbake" | 57 | "dirpath": "bitbake" |
58 | }, | 58 | }, |
59 | { | 59 | { |
60 | "name": "fido", | 60 | "name": "jethro", |
61 | "giturl": "remote:origin", | 61 | "giturl": "remote:origin", |
62 | "branch": "fido", | 62 | "branch": "jethro", |
63 | "dirpath": "bitbake" | 63 | "dirpath": "bitbake" |
64 | }, | 64 | }, |
65 | { | 65 | { |
66 | "name": "dizzy", | 66 | "name": "fido", |
67 | "giturl": "remote:origin", | 67 | "giturl": "remote:origin", |
68 | "branch": "dizzy", | 68 | "branch": "fido", |
69 | "dirpath": "bitbake" | 69 | "dirpath": "bitbake" |
70 | }, | 70 | }, |
71 | { | 71 | { |
@@ -89,6 +89,15 @@ | |||
89 | "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." | 89 | "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." |
90 | }, | 90 | }, |
91 | { | 91 | { |
92 | "name": "jethro", | ||
93 | "description": "Yocto Project 2.0 Jethro", | ||
94 | "bitbake": "jethro", | ||
95 | "branch": "jethro", | ||
96 | "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], | ||
97 | "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, | ||
98 | "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." | ||
99 | }, | ||
100 | { | ||
92 | "name": "fido", | 101 | "name": "fido", |
93 | "description": "Yocto Project 1.8 Fido", | 102 | "description": "Yocto Project 1.8 Fido", |
94 | "bitbake": "fido", | 103 | "bitbake": "fido", |
@@ -98,15 +107,6 @@ | |||
98 | "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." | 107 | "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." |
99 | }, | 108 | }, |
100 | { | 109 | { |
101 | "name": "dizzy", | ||
102 | "description": "Yocto Project 1.7 Dizzy", | ||
103 | "bitbake": "dizzy", | ||
104 | "branch": "dizzy", | ||
105 | "defaultlayers": [ "openembedded-core", "meta-yocto", "meta-yocto-bsp"], | ||
106 | "layersourcepriority": { "Imported layers": 99, "Local Yocto Project" : 10, "OpenEmbedded" : 0 }, | ||
107 | "helptext": "Toaster will run your builds with the tip of the <a href=\"http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=dizzy\">Yocto Project 1.7 \"Dizzy\"</a> branch." | ||
108 | }, | ||
109 | { | ||
110 | "name": "local", | 110 | "name": "local", |
111 | "description": "Local Yocto Project", | 111 | "description": "Local Yocto Project", |
112 | "bitbake": "HEAD", | 112 | "bitbake": "HEAD", |