summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-11-09 19:52:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-23 10:59:56 +0000
commitf59ac87b464ed517d9b2d3920b8f245baa9e46ca (patch)
tree38ea7f3378ff1171f0c15ddc13e6a034a0b367cd /bitbake/lib/toaster
parent50cb0f596f8be44b789f02f31e7bf9f2b9a507d0 (diff)
downloadpoky-f59ac87b464ed517d9b2d3920b8f245baa9e46ca.tar.gz
bitbake: toaster: orm/fixtures Add the master release and correct morty release
Add the master release option to base your project on and correct the morty release so that for poky based setups we use the poky provided version of the layer rather than checking out the layer from its own git repository. [YOCTO #10497] (Bitbake rev: c83ab92362378b22d3f4d6119bf362f704577ca2) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r--bitbake/lib/toaster/orm/fixtures/oe-core.xml23
-rw-r--r--bitbake/lib/toaster/orm/fixtures/poky.xml82
2 files changed, 96 insertions, 9 deletions
diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
index a6c834f448..4d3d185491 100644
--- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml
+++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
@@ -14,6 +14,13 @@
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>
17 <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
18 <field type="CharField" name="branch">HEAD</field>
19 </object>
20 <object model="orm.bitbakeversion" pk="3">
21 <field type="CharField" name="name">master</field>
22 <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
23 <field type="CharField" name="branch">master</field>
17 </object> 24 </object>
18 25
19 <!-- Releases available --> 26 <!-- Releases available -->
@@ -31,18 +38,30 @@
31 <field type="CharField" name="branch_name">HEAD</field> 38 <field type="CharField" name="branch_name">HEAD</field>
32 <field type="TextField" name="helptext">Toaster will run your builds with the version of OpenEmbedded that you have cloned or downloaded to your computer.</field> 39 <field type="TextField" name="helptext">Toaster will run your builds with the version of OpenEmbedded that you have cloned or downloaded to your computer.</field>
33 </object> 40 </object>
41 <object model="orm.release" pk="3">
42 <field type="CharField" name="name">master</field>
43 <field type="CharField" name="description">OpenEmbedded core master</field>
44 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field>
45 <field type="CharField" name="branch_name">master</field>
46 <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>
47 </object>
34 48
35 <!-- Default layers for each release --> 49 <!-- Default layers for each release -->
36 <object model="orm.releasedefaultlayer" pk="1"> 50 <object model="orm.releasedefaultlayer" pk="1">
37 <field rel="ManyToOneRel" to="orm.release" name="release">1</field> 51 <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
38 <field type="CharField" name="layer_name">openembedded-core</field> 52 <field type="CharField" name="layer_name">openembedded-core</field>
39 </object> 53 </object>
40 <object model="orm.releasedefaultlayer" pk="4"> 54 <object model="orm.releasedefaultlayer" pk="2">
41 <field rel="ManyToOneRel" to="orm.release" name="release">2</field> 55 <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
42 <field type="CharField" name="layer_name">openembedded-core</field> 56 <field type="CharField" name="layer_name">openembedded-core</field>
43 </object> 57 </object>
58 <object model="orm.releasedefaultlayer" pk="3">
59 <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
60 <field type="CharField" name="layer_name">openembedded-core</field>
61 </object>
62
44 63
45 <!-- TYPE_LOCAL = 0 Layers for the Local release --> 64 <!-- Layer for the Local release -->
46 <object model="orm.layer" pk="1"> 65 <object model="orm.layer" pk="1">
47 <field type="CharField" name="name">openembedded-core</field> 66 <field type="CharField" name="name">openembedded-core</field>
48 <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field> 67 <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field>
diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml
index c192baa422..dcc7aaffdf 100644
--- a/bitbake/lib/toaster/orm/fixtures/poky.xml
+++ b/bitbake/lib/toaster/orm/fixtures/poky.xml
@@ -19,6 +19,13 @@
19 <field type="CharField" name="branch">HEAD</field> 19 <field type="CharField" name="branch">HEAD</field>
20 <field type="CharField" name="dirpath">bitbake</field> 20 <field type="CharField" name="dirpath">bitbake</field>
21 </object> 21 </object>
22 <object model="orm.bitbakeversion" pk="3">
23 <field type="CharField" name="name">master</field>
24 <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
25 <field type="CharField" name="branch">master</field>
26 <field type="CharField" name="dirpath">bitbake</field>
27 </object>
28
22 29
23 <!-- Releases available --> 30 <!-- Releases available -->
24 <object model="orm.release" pk="1"> 31 <object model="orm.release" pk="1">
@@ -35,8 +42,15 @@
35 <field type="CharField" name="branch_name">HEAD</field> 42 <field type="CharField" name="branch_name">HEAD</field>
36 <field type="TextField" name="helptext">Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer.</field> 43 <field type="TextField" name="helptext">Toaster will run your builds with the version of the Yocto Project you have cloned or downloaded to your computer.</field>
37 </object> 44 </object>
45 <object model="orm.release" pk="3">
46 <field type="CharField" name="name">master</field>
47 <field type="CharField" name="description">Yocto Project master</field>
48 <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field>
49 <field type="CharField" name="branch_name">master</field>
50 <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>
51 </object>
38 52
39 <!-- Default layers for each release --> 53 <!-- Default project layers for each release -->
40 <object model="orm.releasedefaultlayer" pk="1"> 54 <object model="orm.releasedefaultlayer" pk="1">
41 <field rel="ManyToOneRel" to="orm.release" name="release">1</field> 55 <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
42 <field type="CharField" name="layer_name">openembedded-core</field> 56 <field type="CharField" name="layer_name">openembedded-core</field>
@@ -61,9 +75,23 @@
61 <field rel="ManyToOneRel" to="orm.release" name="release">2</field> 75 <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
62 <field type="CharField" name="layer_name">meta-yocto-bsp</field> 76 <field type="CharField" name="layer_name">meta-yocto-bsp</field>
63 </object> 77 </object>
78 <object model="orm.releasedefaultlayer" pk="7">
79 <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
80 <field type="CharField" name="layer_name">openembedded-core</field>
81 </object>
82 <object model="orm.releasedefaultlayer" pk="8">
83 <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
84 <field type="CharField" name="layer_name">meta-poky</field>
85 </object>
86 <object model="orm.releasedefaultlayer" pk="9">
87 <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
88 <field type="CharField" name="layer_name">meta-yocto-bsp</field>
89 </object>
64 90
65 <!-- Layers for the Local release 91 <!-- Default layers provided by poky
66 layersource TYPE_LOCAL = 0 92 openembedded-core
93 meta-poky
94 meta-yocto-bsp
67 --> 95 -->
68 <object model="orm.layer" pk="1"> 96 <object model="orm.layer" pk="1">
69 <field type="CharField" name="name">openembedded-core</field> 97 <field type="CharField" name="name">openembedded-core</field>
@@ -73,19 +101,39 @@
73 <object model="orm.layer_version" pk="1"> 101 <object model="orm.layer_version" pk="1">
74 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> 102 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
75 <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>
105 <field type="CharField" name="branch">morty</field>
106 <field type="CharField" name="dirpath">meta</field>
107 </object>
108 <object model="orm.layer_version" pk="2">
109 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
110 <field type="IntegerField" name="layer_source">0</field>
76 <field rel="ManyToOneRel" to="orm.release" name="release">2</field> 111 <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
77 <field type="CharField" name="branch">HEAD</field> 112 <field type="CharField" name="branch">HEAD</field>
78 <field type="CharField" name="commit">HEAD</field> 113 <field type="CharField" name="commit">HEAD</field>
79 <field type="CharField" name="dirpath">meta</field> 114 <field type="CharField" name="dirpath">meta</field>
80 </object> 115 </object>
81 116 <object model="orm.layer_version" pk="3">
117 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
118 <field type="IntegerField" name="layer_source">0</field>
119 <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
120 <field type="CharField" name="branch">master</field>
121 <field type="CharField" name="dirpath">meta</field>
122 </object>
82 123
83 <object model="orm.layer" pk="2"> 124 <object model="orm.layer" pk="2">
84 <field type="CharField" name="name">meta-poky</field> 125 <field type="CharField" name="name">meta-poky</field>
85 <field type="CharField" name="layer_index_url"></field> 126 <field type="CharField" name="layer_index_url"></field>
86 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> 127 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field>
87 </object> 128 </object>
88 <object model="orm.layer_version" pk="2"> 129 <object model="orm.layer_version" pk="4">
130 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
131 <field type="IntegerField" name="layer_source">0</field>
132 <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
133 <field type="CharField" name="branch">morty</field>
134 <field type="CharField" name="dirpath">meta-poky</field>
135 </object>
136 <object model="orm.layer_version" pk="5">
89 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> 137 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
90 <field type="IntegerField" name="layer_source">0</field> 138 <field type="IntegerField" name="layer_source">0</field>
91 <field rel="ManyToOneRel" to="orm.release" name="release">2</field> 139 <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
@@ -93,14 +141,27 @@
93 <field type="CharField" name="commit">HEAD</field> 141 <field type="CharField" name="commit">HEAD</field>
94 <field type="CharField" name="dirpath">meta-poky</field> 142 <field type="CharField" name="dirpath">meta-poky</field>
95 </object> 143 </object>
96 144 <object model="orm.layer_version" pk="6">
145 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
146 <field type="IntegerField" name="layer_source">0</field>
147 <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
148 <field type="CharField" name="branch">master</field>
149 <field type="CharField" name="dirpath">meta-poky</field>
150 </object>
97 151
98 <object model="orm.layer" pk="3"> 152 <object model="orm.layer" pk="3">
99 <field type="CharField" name="name">meta-yocto-bsp</field> 153 <field type="CharField" name="name">meta-yocto-bsp</field>
100 <field type="CharField" name="layer_index_url"></field> 154 <field type="CharField" name="layer_index_url"></field>
101 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> 155 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field>
102 </object> 156 </object>
103 <object model="orm.layer_version" pk="3"> 157 <object model="orm.layer_version" pk="7">
158 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
159 <field type="IntegerField" name="layer_source">0</field>
160 <field rel="ManyToOneRel" to="orm.release" name="release">1</field>
161 <field type="CharField" name="branch">morty</field>
162 <field type="CharField" name="dirpath">meta-yocto-bsp</field>
163 </object>
164 <object model="orm.layer_version" pk="8">
104 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> 165 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
105 <field type="IntegerField" name="layer_source">0</field> 166 <field type="IntegerField" name="layer_source">0</field>
106 <field rel="ManyToOneRel" to="orm.release" name="release">2</field> 167 <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
@@ -108,4 +169,11 @@
108 <field type="CharField" name="commit">HEAD</field> 169 <field type="CharField" name="commit">HEAD</field>
109 <field type="CharField" name="dirpath">meta-yocto-bsp</field> 170 <field type="CharField" name="dirpath">meta-yocto-bsp</field>
110 </object> 171 </object>
172 <object model="orm.layer_version" pk="9">
173 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
174 <field type="IntegerField" name="layer_source">0</field>
175 <field rel="ManyToOneRel" to="orm.release" name="release">3</field>
176 <field type="CharField" name="branch">master</field>
177 <field type="CharField" name="dirpath">meta-yocto-bsp</field>
178 </object>
111</django-objects> 179</django-objects>