summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian avery <brian.avery@intel.com>2016-10-14 16:27:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-15 13:21:54 +0100
commit7656dea6dba988f3e85b682e9fd52adca6ecd745 (patch)
tree8b010da0037b612ffb63091cafd735b2544d0ae0
parent0fc03bedd0b316328ff54bc26df62a40fce55bee (diff)
downloadpoky-7656dea6dba988f3e85b682e9fd52adca6ecd745.tar.gz
bitbake: toaster: Update oe-core fixture for Morty release
Update the oe-core fixture to the Morty release. This removes the master branch from the release and limits it to the morty branch. Normally, we would also support at least one past branch but the change from Python 2.7 -> Python 3 makes that infeasible. (Bitbake rev: 93f1e6c3d022b1f12a230879160efa941cb1e250) Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/orm/fixtures/oe-core.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
index d062de57f6..a6c834f448 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">master</field> 11 <field type="CharField" name="name">morty</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">master</field> 13 <field type="CharField" name="branch">1.32</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>
@@ -18,11 +18,11 @@
18 18
19 <!-- Releases available --> 19 <!-- Releases available -->
20 <object model="orm.release" pk="1"> 20 <object model="orm.release" pk="1">
21 <field type="CharField" name="name">master</field> 21 <field type="CharField" name="name">morty</field>
22 <field type="CharField" name="description">Openembedded master</field> 22 <field type="CharField" name="description">Openembedded Morty</field>
23 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> 23 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
24 <field type="CharField" name="branch_name">master</field> 24 <field type="CharField" name="branch_name">morty</field>
25 <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, where active development takes place. This is not a stable branch, so your builds might not work as expected.</field> 25 <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=morty\"&gt;OpenEmbedded Morty&lt;/a&gt; branch.</field>
26 </object> 26 </object>
27 <object model="orm.release" pk="2"> 27 <object model="orm.release" pk="2">
28 <field type="CharField" name="name">local</field> 28 <field type="CharField" name="name">local</field>
@@ -41,12 +41,12 @@
41 <field rel="ManyToOneRel" to="orm.release" name="release">2</field> 41 <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
42 <field type="CharField" name="layer_name">openembedded-core</field> 42 <field type="CharField" name="layer_name">openembedded-core</field>
43 </object> 43 </object>
44 44
45 <!-- TYPE_LOCAL = 0 Layers for the Local release --> 45 <!-- TYPE_LOCAL = 0 Layers for the Local release -->
46 <object model="orm.layer" pk="1"> 46 <object model="orm.layer" pk="1">
47 <field type="CharField" name="name">openembedded-core</field> 47 <field type="CharField" name="name">openembedded-core</field>
48 <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field> 48 <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field>
49 </object> 49 </object>
50 <object model="orm.layer_version" pk="1"> 50 <object model="orm.layer_version" pk="1">
51 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> 51 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
52 <field rel="ManyToOneRel" to="orm.release" name="release">2</field> 52 <field rel="ManyToOneRel" to="orm.release" name="release">2</field>