diff options
author | David Reyna <David.Reyna@windriver.com> | 2017-04-19 22:41:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-20 07:59:40 +0100 |
commit | c519dc1cd4402b0c0d770ce8023e8cb297bb2c3f (patch) | |
tree | 45bacd7a96a8836f4d44441847bf2d8c366c366d /bitbake | |
parent | d45f5be97741909bd9024e80ac385591d3872d0c (diff) | |
download | poky-c519dc1cd4402b0c0d770ce8023e8cb297bb2c3f.tar.gz |
bitbake: toaster: move release lookup from morty to pyro
Move the release name lookup into the layer index
from 'morty' to the 'pyro'.
Move the bitbake branch from 1.32 to 1.34.
[YOCTO #11377]
(Bitbake rev: 21d963149b5d97452420230a252101115b708d85)
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 | 12 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/fixtures/poky.xml | 18 |
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 4d3d185491..e285ec6ed3 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">morty</field> | 11 | <field type="CharField" name="name">pyro</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.32</field> | 13 | <field type="CharField" name="branch">1.34</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> |
@@ -25,11 +25,11 @@ | |||
25 | 25 | ||
26 | <!-- Releases available --> | 26 | <!-- Releases available --> |
27 | <object model="orm.release" pk="1"> | 27 | <object model="orm.release" pk="1"> |
28 | <field type="CharField" name="name">morty</field> | 28 | <field type="CharField" name="name">pyro</field> |
29 | <field type="CharField" name="description">Openembedded Morty</field> | 29 | <field type="CharField" name="description">Openembedded Pyro</field> |
30 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | 30 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> |
31 | <field type="CharField" name="branch_name">morty</field> | 31 | <field type="CharField" name="branch_name">pyro</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=morty\">OpenEmbedded Morty</a> branch.</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=pyro\">OpenEmbedded Pyro</a> branch.</field> |
33 | </object> | 33 | </object> |
34 | <object model="orm.release" pk="2"> | 34 | <object model="orm.release" pk="2"> |
35 | <field type="CharField" name="name">local</field> | 35 | <field type="CharField" name="name">local</field> |
diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml index dcc7aaffdf..b3f6c9634c 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">morty</field> | 11 | <field type="CharField" name="name">pyro</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">morty</field> | 13 | <field type="CharField" name="branch">pyro</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"> |
@@ -29,11 +29,11 @@ | |||
29 | 29 | ||
30 | <!-- Releases available --> | 30 | <!-- Releases available --> |
31 | <object model="orm.release" pk="1"> | 31 | <object model="orm.release" pk="1"> |
32 | <field type="CharField" name="name">morty</field> | 32 | <field type="CharField" name="name">pyro</field> |
33 | <field type="CharField" name="description">Yocto Project 2.2 "Morty"</field> | 33 | <field type="CharField" name="description">Yocto Project 2.3 "Pyro"</field> |
34 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> | 34 | <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field> |
35 | <field type="CharField" name="branch_name">morty</field> | 35 | <field type="CharField" name="branch_name">pyro</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=morty">Yocto Project Morty branch</a>.</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=pyro">Yocto Project Pyro branch</a>.</field> |
37 | </object> | 37 | </object> |
38 | <object model="orm.release" pk="2"> | 38 | <object model="orm.release" pk="2"> |
39 | <field type="CharField" name="name">local</field> | 39 | <field type="CharField" name="name">local</field> |
@@ -102,7 +102,7 @@ | |||
102 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> | 102 | <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> |
103 | <field type="IntegerField" name="layer_source">0</field> | 103 | <field type="IntegerField" name="layer_source">0</field> |
104 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> | 104 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> |
105 | <field type="CharField" name="branch">morty</field> | 105 | <field type="CharField" name="branch">pyro</field> |
106 | <field type="CharField" name="dirpath">meta</field> | 106 | <field type="CharField" name="dirpath">meta</field> |
107 | </object> | 107 | </object> |
108 | <object model="orm.layer_version" pk="2"> | 108 | <object model="orm.layer_version" pk="2"> |
@@ -130,7 +130,7 @@ | |||
130 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> | 130 | <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> |
131 | <field type="IntegerField" name="layer_source">0</field> | 131 | <field type="IntegerField" name="layer_source">0</field> |
132 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> | 132 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> |
133 | <field type="CharField" name="branch">morty</field> | 133 | <field type="CharField" name="branch">pyro</field> |
134 | <field type="CharField" name="dirpath">meta-poky</field> | 134 | <field type="CharField" name="dirpath">meta-poky</field> |
135 | </object> | 135 | </object> |
136 | <object model="orm.layer_version" pk="5"> | 136 | <object model="orm.layer_version" pk="5"> |
@@ -158,7 +158,7 @@ | |||
158 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> | 158 | <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> |
159 | <field type="IntegerField" name="layer_source">0</field> | 159 | <field type="IntegerField" name="layer_source">0</field> |
160 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> | 160 | <field rel="ManyToOneRel" to="orm.release" name="release">1</field> |
161 | <field type="CharField" name="branch">morty</field> | 161 | <field type="CharField" name="branch">pyro</field> |
162 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> | 162 | <field type="CharField" name="dirpath">meta-yocto-bsp</field> |
163 | </object> | 163 | </object> |
164 | <object model="orm.layer_version" pk="8"> | 164 | <object model="orm.layer_version" pk="8"> |