diff options
author | David Reyna <david.reyna@windriver.com> | 2018-04-26 00:53:28 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-26 11:43:26 +0100 |
commit | b6bc5b2840246ac0f0e5d8cebcdffc1a0ca2518f (patch) | |
tree | 483ac085365b853cc0cadf5782d7be20a2142fb1 /bitbake | |
parent | da3625c52e1ab8985fba4fc3d133edf92142f182 (diff) | |
download | poky-b6bc5b2840246ac0f0e5d8cebcdffc1a0ca2518f.tar.gz |
bitbake: toaster: add 'Sumo' to release selection
Add Sumo (YP-2.5) to the release selection for new projects.
[YOCTO #12713]
(Bitbake rev: 76b17ffcea5c7275c2f9735a058256ba909b1a75)
Signed-off-by: David Reyna <david.reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/orm/fixtures/oe-core.xml | 26 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/fixtures/poky.xml | 76 |
2 files changed, 82 insertions, 20 deletions
diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml index 00720c3da9..d7ea78dc29 100644 --- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml +++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml | |||
@@ -8,9 +8,9 @@ | |||
8 | 8 | ||
9 | <!-- Bitbake versions which correspond to the metadata release --> | 9 | <!-- Bitbake versions which correspond to the metadata release --> |
10 | <object model="orm.bitbakeversion" pk="1"> | 10 | <object model="orm.bitbakeversion" pk="1"> |
11 | <field type="CharField" name="name">rocko</field> | 11 | <field type="CharField" name="name">sumo</field> |
12 | <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> | 12 | <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> |
13 | <field type="CharField" name="branch">1.36</field> | 13 | <field type="CharField" name="branch">1.38</field> |
14 | </object> | 14 | </object> |
15 | <object model="orm.bitbakeversion" pk="2"> | 15 | <object model="orm.bitbakeversion" pk="2"> |
16 | <field type="CharField" name="name">HEAD</field> | 16 | <field type="CharField" name="name">HEAD</field> |
@@ -22,14 +22,19 @@ | |||
22 | <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> | 22 | <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> |
23 | <field type="CharField" name="branch">master</field> | 23 | <field type="CharField" name="branch">master</field> |
24 | </object> | 24 | </object> |
25 | <object model="orm.bitbakeversion" pk="4"> | ||
26 | <field type="CharField" name="name">rocko</field> | ||
27 | <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> | ||
28 | <field type="CharField" name="branch">1.36</field> | ||
29 | </object> | ||
25 | 30 | ||
26 | <!-- Releases available --> | 31 | <!-- Releases available --> |
27 | <object model="orm.release" pk="1"> | 32 | <object model="orm.release" pk="1"> |
28 | <field type="CharField" name="name">rocko</field> | 33 | <field type="CharField" name="name">rocko</field> |
29 | <field type="CharField" name="description">Openembedded Rocko</field> | 34 | <field type="CharField" name="description">Openembedded Sumo</field> |
30 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | 35 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> |
31 | <field type="CharField" name="branch_name">rocko</field> | 36 | <field type="CharField" name="branch_name">sumo</field> |
32 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=rocko\">OpenEmbedded Rocko</a> branch.</field> | 37 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=sumo\">OpenEmbedded Sumo</a> branch.</field> |
33 | </object> | 38 | </object> |
34 | <object model="orm.release" pk="2"> | 39 | <object model="orm.release" pk="2"> |
35 | <field type="CharField" name="name">local</field> | 40 | <field type="CharField" name="name">local</field> |
@@ -45,6 +50,13 @@ | |||
45 | <field type="CharField" name="branch_name">master</field> | 50 | <field type="CharField" name="branch_name">master</field> |
46 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch.</field> | 51 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/\">OpenEmbedded master</a> branch.</field> |
47 | </object> | 52 | </object> |
53 | <object model="orm.release" pk="4"> | ||
54 | <field type="CharField" name="name">rocko</field> | ||
55 | <field type="CharField" name="description">Openembedded Rocko</field> | ||
56 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | ||
57 | <field type="CharField" name="branch_name">rocko</field> | ||
58 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=rocko\">OpenEmbedded Rocko</a> branch.</field> | ||
59 | </object> | ||
48 | 60 | ||
49 | <!-- Default layers for each release --> | 61 | <!-- Default layers for each release --> |
50 | <object model="orm.releasedefaultlayer" pk="1"> | 62 | <object model="orm.releasedefaultlayer" pk="1"> |
@@ -59,6 +71,10 @@ | |||
59 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> | 71 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> |
60 | <field type="CharField" name="layer_name">openembedded-core</field> | 72 | <field type="CharField" name="layer_name">openembedded-core</field> |
61 | </object> | 73 | </object> |
74 | <object model="orm.releasedefaultlayer" pk="4"> | ||
75 | <field rel="ManyToOneRel" to="orm.release" name="release">4</field> | ||
76 | <field type="CharField" name="layer_name">openembedded-core</field> | ||
77 | </object> | ||
62 | 78 | ||
63 | 79 | ||
64 | <!-- Layer for the Local release --> | 80 | <!-- Layer for the Local release --> |
diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml index 2f39d7776d..6c966da4a9 100644 --- a/bitbake/lib/toaster/orm/fixtures/poky.xml +++ b/bitbake/lib/toaster/orm/fixtures/poky.xml | |||
@@ -8,9 +8,9 @@ | |||
8 | 8 | ||
9 | <!-- Bitbake versions which correspond to the metadata release --> | 9 | <!-- Bitbake versions which correspond to the metadata release --> |
10 | <object model="orm.bitbakeversion" pk="1"> | 10 | <object model="orm.bitbakeversion" pk="1"> |
11 | <field type="CharField" name="name">rocko</field> | 11 | <field type="CharField" name="name">sumo</field> |
12 | <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field> | 12 | <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field> |
13 | <field type="CharField" name="branch">rocko</field> | 13 | <field type="CharField" name="branch">sumo</field> |
14 | <field type="CharField" name="dirpath">bitbake</field> | 14 | <field type="CharField" name="dirpath">bitbake</field> |
15 | </object> | 15 | </object> |
16 | <object model="orm.bitbakeversion" pk="2"> | 16 | <object model="orm.bitbakeversion" pk="2"> |
@@ -25,15 +25,21 @@ | |||
25 | <field type="CharField" name="branch">master</field> | 25 | <field type="CharField" name="branch">master</field> |
26 | <field type="CharField" name="dirpath">bitbake</field> | 26 | <field type="CharField" name="dirpath">bitbake</field> |
27 | </object> | 27 | </object> |
28 | <object model="orm.bitbakeversion" pk="4"> | ||
29 | <field type="CharField" name="name">rocko</field> | ||
30 | <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field> | ||
31 | <field type="CharField" name="branch">rocko</field> | ||
32 | <field type="CharField" name="dirpath">bitbake</field> | ||
33 | </object> | ||
28 | 34 | ||
29 | 35 | ||
30 | <!-- Releases available --> | 36 | <!-- Releases available --> |
31 | <object model="orm.release" pk="1"> | 37 | <object model="orm.release" pk="1"> |
32 | <field type="CharField" name="name">rocko</field> | 38 | <field type="CharField" name="name">sumo</field> |
33 | <field type="CharField" name="description">Yocto Project 2.4 "Rocko"</field> | 39 | <field type="CharField" name="description">Yocto Project 2.5 "Sumo"</field> |
34 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | 40 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> |
35 | <field type="CharField" name="branch_name">rocko</field> | 41 | <field type="CharField" name="branch_name">sumo</field> |
36 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=rocko">Yocto Project Rocko branch</a>.</field> | 42 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=sumo">Yocto Project Sumo branch</a>.</field> |
37 | </object> | 43 | </object> |
38 | <object model="orm.release" pk="2"> | 44 | <object model="orm.release" pk="2"> |
39 | <field type="CharField" name="name">local</field> | 45 | <field type="CharField" name="name">local</field> |
@@ -49,6 +55,13 @@ | |||
49 | <field type="CharField" name="branch_name">master</field> | 55 | <field type="CharField" name="branch_name">master</field> |
50 | <field type="TextField" name="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>.</field> | 56 | <field type="TextField" name="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>.</field> |
51 | </object> | 57 | </object> |
58 | <object model="orm.release" pk="4"> | ||
59 | <field type="CharField" name="name">rocko</field> | ||
60 | <field type="CharField" name="description">Yocto Project 2.4 "Rocko"</field> | ||
61 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | ||
62 | <field type="CharField" name="branch_name">rocko</field> | ||
63 | <field type="TextField" name="helptext">Toaster will run your builds using the tip of the <a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=rocko">Yocto Project Rocko branch</a>.</field> | ||
64 | </object> | ||
52 | 65 | ||
53 | <!-- Default project layers for each release --> | 66 | <!-- Default project layers for each release --> |
54 | <object model="orm.releasedefaultlayer" pk="1"> | 67 | <object model="orm.releasedefaultlayer" pk="1"> |
@@ -87,6 +100,18 @@ | |||
87 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> | 100 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> |
88 | <field type="CharField" name="layer_name">meta-yocto-bsp</field> | 101 | <field type="CharField" name="layer_name">meta-yocto-bsp</field> |
89 | </object> | 102 | </object> |
103 | <object model="orm.releasedefaultlayer" pk="10"> | ||
104 | <field rel="ManyToOneRel" to="orm.release" name="release">4</field> | ||
105 | <field type="CharField" name="layer_name">openembedded-core</field> | ||
106 | </object> | ||
107 | <object model="orm.releasedefaultlayer" pk="11"> | ||
108 | <field rel="ManyToOneRel" to="orm.release" name="release">4</field> | ||
109 | <field type="CharField" name="layer_name">meta-poky</field> | ||
110 | </object> | ||
111 | <object model="orm.releasedefaultlayer" pk="12"> | ||
112 | <field rel="ManyToOneRel" to="orm.release" name="release">4</field> | ||
113 | <field type="CharField" name="layer_name">meta-yocto-bsp</field> | ||
114 | </object> | ||
90 | 115 | ||
91 | <!-- Default layers provided by poky | 116 | <!-- Default layers provided by poky |
92 | openembedded-core | 117 | openembedded-core |
@@ -105,7 +130,7 @@ | |||
105 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> | 130 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> |
106 | <field type="IntegerField" name="layer_source">0</field> | 131 | <field type="IntegerField" name="layer_source">0</field> |
107 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> | 132 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> |
108 | <field type="CharField" name="branch">rocko</field> | 133 | <field type="CharField" name="branch">sumo</field> |
109 | <field type="CharField" name="dirpath">meta</field> | 134 | <field type="CharField" name="dirpath">meta</field> |
110 | </object> | 135 | </object> |
111 | <object model="orm.layer_version" pk="2"> | 136 | <object model="orm.layer_version" pk="2"> |
@@ -123,6 +148,13 @@ | |||
123 | <field type="CharField" name="branch">master</field> | 148 | <field type="CharField" name="branch">master</field> |
124 | <field type="CharField" name="dirpath">meta</field> | 149 | <field type="CharField" name="dirpath">meta</field> |
125 | </object> | 150 | </object> |
151 | <object model="orm.layer_version" pk="4"> | ||
152 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> | ||
153 | <field type="IntegerField" name="layer_source">0</field> | ||
154 | <field rel="ManyToOneRel" to="orm.release" name="release">4</field> | ||
155 | <field type="CharField" name="branch">rocko</field> | ||
156 | <field type="CharField" name="dirpath">meta</field> | ||
157 | </object> | ||
126 | 158 | ||
127 | <object model="orm.layer" pk="2"> | 159 | <object model="orm.layer" pk="2"> |
128 | <field type="CharField" name="name">meta-poky</field> | 160 | <field type="CharField" name="name">meta-poky</field> |
@@ -132,14 +164,14 @@ | |||
132 | <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 164 | <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
133 | <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 165 | <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
134 | </object> | 166 | </object> |
135 | <object model="orm.layer_version" pk="4"> | 167 | <object model="orm.layer_version" pk="5"> |
136 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> | 168 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> |
137 | <field type="IntegerField" name="layer_source">0</field> | 169 | <field type="IntegerField" name="layer_source">0</field> |
138 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> | 170 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> |
139 | <field type="CharField" name="branch">rocko</field> | 171 | <field type="CharField" name="branch">sumo</field> |
140 | <field type="CharField" name="dirpath">meta-poky</field> | 172 | <field type="CharField" name="dirpath">meta-poky</field> |
141 | </object> | 173 | </object> |
142 | <object model="orm.layer_version" pk="5"> | 174 | <object model="orm.layer_version" pk="6"> |
143 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> | 175 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> |
144 | <field type="IntegerField" name="layer_source">0</field> | 176 | <field type="IntegerField" name="layer_source">0</field> |
145 | <field rel="ManyToOneRel" to="orm.release" name="release">2</field> | 177 | <field rel="ManyToOneRel" to="orm.release" name="release">2</field> |
@@ -147,13 +179,20 @@ | |||
147 | <field type="CharField" name="commit">HEAD</field> | 179 | <field type="CharField" name="commit">HEAD</field> |
148 | <field type="CharField" name="dirpath">meta-poky</field> | 180 | <field type="CharField" name="dirpath">meta-poky</field> |
149 | </object> | 181 | </object> |
150 | <object model="orm.layer_version" pk="6"> | 182 | <object model="orm.layer_version" pk="7"> |
151 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> | 183 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> |
152 | <field type="IntegerField" name="layer_source">0</field> | 184 | <field type="IntegerField" name="layer_source">0</field> |
153 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> | 185 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> |
154 | <field type="CharField" name="branch">master</field> | 186 | <field type="CharField" name="branch">master</field> |
155 | <field type="CharField" name="dirpath">meta-poky</field> | 187 | <field type="CharField" name="dirpath">meta-poky</field> |
156 | </object> | 188 | </object> |
189 | <object model="orm.layer_version" pk="8"> | ||
190 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> | ||
191 | <field type="IntegerField" name="layer_source">0</field> | ||
192 | <field rel="ManyToOneRel" to="orm.release" name="release">4</field> | ||
193 | <field type="CharField" name="branch">rocko</field> | ||
194 | <field type="CharField" name="dirpath">meta-poky</field> | ||
195 | </object> | ||
157 | 196 | ||
158 | <object model="orm.layer" pk="3"> | 197 | <object model="orm.layer" pk="3"> |
159 | <field type="CharField" name="name">meta-yocto-bsp</field> | 198 | <field type="CharField" name="name">meta-yocto-bsp</field> |
@@ -163,14 +202,14 @@ | |||
163 | <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 202 | <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
164 | <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> | 203 | <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field> |
165 | </object> | 204 | </object> |
166 | <object model="orm.layer_version" pk="7"> | 205 | <object model="orm.layer_version" pk="9"> |
167 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> | 206 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> |
168 | <field type="IntegerField" name="layer_source">0</field> | 207 | <field type="IntegerField" name="layer_source">0</field> |
169 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> | 208 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> |
170 | <field type="CharField" name="branch">rocko</field> | 209 | <field type="CharField" name="branch">sumo</field> |
171 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> | 210 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> |
172 | </object> | 211 | </object> |
173 | <object model="orm.layer_version" pk="8"> | 212 | <object model="orm.layer_version" pk="10"> |
174 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> | 213 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> |
175 | <field type="IntegerField" name="layer_source">0</field> | 214 | <field type="IntegerField" name="layer_source">0</field> |
176 | <field rel="ManyToOneRel" to="orm.release" name="release">2</field> | 215 | <field rel="ManyToOneRel" to="orm.release" name="release">2</field> |
@@ -178,11 +217,18 @@ | |||
178 | <field type="CharField" name="commit">HEAD</field> | 217 | <field type="CharField" name="commit">HEAD</field> |
179 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> | 218 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> |
180 | </object> | 219 | </object> |
181 | <object model="orm.layer_version" pk="9"> | 220 | <object model="orm.layer_version" pk="11"> |
182 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> | 221 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> |
183 | <field type="IntegerField" name="layer_source">0</field> | 222 | <field type="IntegerField" name="layer_source">0</field> |
184 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> | 223 | <field rel="ManyToOneRel" to="orm.release" name="release">3</field> |
185 | <field type="CharField" name="branch">master</field> | 224 | <field type="CharField" name="branch">master</field> |
186 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> | 225 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> |
187 | </object> | 226 | </object> |
227 | <object model="orm.layer_version" pk="12"> | ||
228 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> | ||
229 | <field type="IntegerField" name="layer_source">0</field> | ||
230 | <field rel="ManyToOneRel" to="orm.release" name="release">4</field> | ||
231 | <field type="CharField" name="branch">rocko</field> | ||
232 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> | ||
233 | </object> | ||
188 | </django-objects> | 234 | </django-objects> |