summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/orm
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2017-09-03 21:02:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-05 15:00:49 +0100
commit019f68981389c49a78fe78509417409adee7ef03 (patch)
tree9806ad6e7583ec7d6f741cc71c6fb92e97ae0dcb /bitbake/lib/toaster/orm
parentbdb1f7571ed539b89ce42268a81ab76d27133dd9 (diff)
downloadpoky-019f68981389c49a78fe78509417409adee7ef03.tar.gz
bitbake: toaster: recipe links broken for default layers
The default layers are missing the recipe link definitions in the fixture files, and because they are predefined they do not get the updated information from the Layer Index. [YOCTO #12006] (Bitbake rev: 2ff5592baf011de9c778d3c2481b8ed3912f1a4b) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/orm')
-rw-r--r--bitbake/lib/toaster/orm/fixtures/oe-core.xml3
-rw-r--r--bitbake/lib/toaster/orm/fixtures/poky.xml9
-rw-r--r--bitbake/lib/toaster/orm/management/commands/lsupdates.py2
3 files changed, 14 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/orm/fixtures/oe-core.xml b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
index e285ec6ed3..66c3595f8c 100644
--- a/bitbake/lib/toaster/orm/fixtures/oe-core.xml
+++ b/bitbake/lib/toaster/orm/fixtures/oe-core.xml
@@ -65,6 +65,9 @@
65 <object model="orm.layer" pk="1"> 65 <object model="orm.layer" pk="1">
66 <field type="CharField" name="name">openembedded-core</field> 66 <field type="CharField" name="name">openembedded-core</field>
67 <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>
68 <field type="CharField" name="vcs_web_url">http://cgit.openembedded.org/openembedded-core</field>
69 <field type="CharField" name="vcs_web_tree_base_url">http://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field>
70 <field type="CharField" name="vcs_web_file_base_url">http://cgit.openembedded.org/openembedded-core/tree/%path%?h=%branch%</field>
68 </object> 71 </object>
69 <object model="orm.layer_version" pk="1"> 72 <object model="orm.layer_version" pk="1">
70 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> 73 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
diff --git a/bitbake/lib/toaster/orm/fixtures/poky.xml b/bitbake/lib/toaster/orm/fixtures/poky.xml
index b3f6c9634c..7827aac289 100644
--- a/bitbake/lib/toaster/orm/fixtures/poky.xml
+++ b/bitbake/lib/toaster/orm/fixtures/poky.xml
@@ -97,6 +97,9 @@
97 <field type="CharField" name="name">openembedded-core</field> 97 <field type="CharField" name="name">openembedded-core</field>
98 <field type="CharField" name="layer_index_url"></field> 98 <field type="CharField" name="layer_index_url"></field>
99 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> 99 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field>
100 <field type="CharField" name="vcs_web_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky</field>
101 <field type="CharField" name="vcs_web_tree_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field>
102 <field type="CharField" name="vcs_web_file_base_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/%path%?h=%branch%</field>
100 </object> 103 </object>
101 <object model="orm.layer_version" pk="1"> 104 <object model="orm.layer_version" pk="1">
102 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> 105 <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
@@ -125,6 +128,9 @@
125 <field type="CharField" name="name">meta-poky</field> 128 <field type="CharField" name="name">meta-poky</field>
126 <field type="CharField" name="layer_index_url"></field> 129 <field type="CharField" name="layer_index_url"></field>
127 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> 130 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field>
131 <field type="CharField" name="vcs_web_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky</field>
132 <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>
128 </object> 134 </object>
129 <object model="orm.layer_version" pk="4"> 135 <object model="orm.layer_version" pk="4">
130 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field> 136 <field rel="ManyToOneRel" to="orm.layer" name="layer">2</field>
@@ -153,6 +159,9 @@
153 <field type="CharField" name="name">meta-yocto-bsp</field> 159 <field type="CharField" name="name">meta-yocto-bsp</field>
154 <field type="CharField" name="layer_index_url"></field> 160 <field type="CharField" name="layer_index_url"></field>
155 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field> 161 <field type="CharField" name="vcs_url">git://git.yoctoproject.org/poky</field>
162 <field type="CharField" name="vcs_web_url">http://git.yoctoproject.org/cgit/cgit.cgi/poky</field>
163 <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>
156 </object> 165 </object>
157 <object model="orm.layer_version" pk="7"> 166 <object model="orm.layer_version" pk="7">
158 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field> 167 <field rel="ManyToOneRel" to="orm.layer" name="layer">3</field>
diff --git a/bitbake/lib/toaster/orm/management/commands/lsupdates.py b/bitbake/lib/toaster/orm/management/commands/lsupdates.py
index 54b4fab068..efc6b3a946 100644
--- a/bitbake/lib/toaster/orm/management/commands/lsupdates.py
+++ b/bitbake/lib/toaster/orm/management/commands/lsupdates.py
@@ -166,6 +166,8 @@ class Command(BaseCommand):
166 l.description = li['description'] 166 l.description = li['description']
167 167
168 if created: 168 if created:
169 # predefined layers in the fixtures (for example poky.xml)
170 # always preempt the Layer Index for these values
169 l.vcs_url = li['vcs_url'] 171 l.vcs_url = li['vcs_url']
170 l.vcs_web_url = li['vcs_web_url'] 172 l.vcs_web_url = li['vcs_web_url']
171 l.vcs_web_tree_base_url = li['vcs_web_tree_base_url'] 173 l.vcs_web_tree_base_url = li['vcs_web_tree_base_url']