summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2019-10-06 21:41:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-08 20:49:36 +0100
commit704c3e623eb6f7d271aa29024d8c9d228e2d3ccf (patch)
tree25d5af9cbd84cb340e967ba8583eb02e3f1b88bc
parent8e73607152cc228a10124d3efe771761269b7595 (diff)
downloadpoky-704c3e623eb6f7d271aa29024d8c9d228e2d3ccf.tar.gz
bitbake: toaster: Enable Zeus branch in place of Thud
Toaster directly supports the last two stable branches of Yocto Project. With "Zeus" being released, it is time to replace "Thud". [YOCTO #13579] (Bitbake rev: 29374386fd7fcfac9d4070584dff76327845595e) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/orm/fixtures/oe-core.xml12
-rw-r--r--bitbake/lib/toaster/orm/fixtures/poky.xml18
2 files changed, 15 insertions, 15 deletions
diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
index 9ae2e423e0..a723f5a2a7 100644
--- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml
+++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
@@ -23,9 +23,9 @@
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"> 25 <object model="orm.bitbakeversion" pk="4">
26 <field type="CharField" name="name">thud</field> 26 <field type="CharField" name="name">zeus</field>
27 <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> 27 <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
28 <field type="CharField" name="branch">1.40</field> 28 <field type="CharField" name="branch">1.44</field>
29 </object> 29 </object>
30 30
31 <!-- Releases available --> 31 <!-- Releases available -->
@@ -51,11 +51,11 @@
51 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"http://cgit.openembedded.org/openembedded-core/log/\"&gt;OpenEmbedded master&lt;/a&gt; branch.</field> 51 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"http://cgit.openembedded.org/openembedded-core/log/\"&gt;OpenEmbedded master&lt;/a&gt; branch.</field>
52 </object> 52 </object>
53 <object model="orm.release" pk="4"> 53 <object model="orm.release" pk="4">
54 <field type="CharField" name="name">thud</field> 54 <field type="CharField" name="name">zeus</field>
55 <field type="CharField" name="description">Openembedded Thud</field> 55 <field type="CharField" name="description">Openembedded Zeus</field>
56 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> 56 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
57 <field type="CharField" name="branch_name">thud</field> 57 <field type="CharField" name="branch_name">zeus</field>
58 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=thud\"&gt;OpenEmbedded Thud&lt;/a&gt; branch.</field> 58 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=zeus\"&gt;OpenEmbedded Zeus&lt;/a&gt; branch.</field>
59 </object> 59 </object>
60 60
61 <!-- Default layers for each release --> 61 <!-- Default layers for each release -->
diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml
index da3b93032b..79923837f6 100644
--- a/bitbake/lib/toaster/orm/fixtures/poky.xml
+++ b/bitbake/lib/toaster/orm/fixtures/poky.xml
@@ -26,9 +26,9 @@
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"> 28 <object model="orm.bitbakeversion" pk="4">
29 <field type="CharField" name="name">thud</field> 29 <field type="CharField" name="name">zeus</field>
30 <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field> 30 <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
31 <field type="CharField" name="branch">thud</field> 31 <field type="CharField" name="branch">zeus</field>
32 <field type="CharField" name="dirpath">bitbake</field> 32 <field type="CharField" name="dirpath">bitbake</field>
33 </object> 33 </object>
34 34
@@ -56,11 +56,11 @@
56 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/"&gt;Yocto Project Master branch&lt;/a&gt;.</field> 56 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/"&gt;Yocto Project Master branch&lt;/a&gt;.</field>
57 </object> 57 </object>
58 <object model="orm.release" pk="4"> 58 <object model="orm.release" pk="4">
59 <field type="CharField" name="name">thud</field> 59 <field type="CharField" name="name">zeus</field>
60 <field type="CharField" name="description">Yocto Project 2.6 "Thud"</field> 60 <field type="CharField" name="description">Yocto Project 3.0 "Zeus"</field>
61 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field> 61 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">4</field>
62 <field type="CharField" name="branch_name">thud</field> 62 <field type="CharField" name="branch_name">zeus</field>
63 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=thud"&gt;Yocto Project Thud branch&lt;/a&gt;.</field> 63 <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=zeus"&gt;Yocto Project Zeus branch&lt;/a&gt;.</field>
64 </object> 64 </object>
65 65
66 <!-- Default project layers for each release --> 66 <!-- Default project layers for each release -->
@@ -152,7 +152,7 @@
152 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> 152 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
153 <field type="IntegerField" name="layer_source">0</field> 153 <field type="IntegerField" name="layer_source">0</field>
154 <field rel="ManyToOneRel" to="orm.release" name="release">4</field> 154 <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
155 <field type="CharField" name="branch">thud</field> 155 <field type="CharField" name="branch">zeus</field>
156 <field type="CharField" name="dirpath">meta</field> 156 <field type="CharField" name="dirpath">meta</field>
157 </object> 157 </object>
158 158
@@ -190,7 +190,7 @@
190 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> 190 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
191 <field type="IntegerField" name="layer_source">0</field> 191 <field type="IntegerField" name="layer_source">0</field>
192 <field rel="ManyToOneRel" to="orm.release" name="release">4</field> 192 <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
193 <field type="CharField" name="branch">thud</field> 193 <field type="CharField" name="branch">zeus</field>
194 <field type="CharField" name="dirpath">meta-poky</field> 194 <field type="CharField" name="dirpath">meta-poky</field>
195 </object> 195 </object>
196 196
@@ -228,7 +228,7 @@
228 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> 228 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
229 <field type="IntegerField" name="layer_source">0</field> 229 <field type="IntegerField" name="layer_source">0</field>
230 <field rel="ManyToOneRel" to="orm.release" name="release">4</field> 230 <field rel="ManyToOneRel" to="orm.release" name="release">4</field>
231 <field type="CharField" name="branch">thud</field> 231 <field type="CharField" name="branch">zeus</field>
232 <field type="CharField" name="dirpath">meta-yocto-bsp</field> 232 <field type="CharField" name="dirpath">meta-yocto-bsp</field>
233 </object> 233 </object>
234</django-objects> 234</django-objects>