<div dir="ltr"><div><div><div>Hi,<br><br></div>Seems like the migration changes are not merged upstream. Only models changes are there.<br><br></div>Thanks,<br></div>Sujith H<br><div><div><div><div><div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 22, 2016 at 9:12 PM, Elliot Smith <span dir="ltr"><<a href="mailto:elliot.smith@intel.com" target="_blank">elliot.smith@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Michael Wood <<a href="mailto:michael.g.wood@intel.com">michael.g.wood@intel.com</a>><br>
<br>
We no longer only deal with layers that have their source in a gir<br>
repository, we also allow for local directories too so update the<br>
BRLayer model to reflect this.<br>
<br>
Signed-off-by: Michael Wood <<a href="mailto:michael.g.wood@intel.com">michael.g.wood@intel.com</a>><br>
Signed-off-by: Elliot Smith <<a href="mailto:elliot.smith@intel.com">elliot.smith@intel.com</a>><br>
---<br>
.../migrations/0007_brlayers_<wbr>optional_gitinfo.py | 29 ++++++++++++++++++++++<br>
bitbake/lib/toaster/<wbr>bldcontrol/models.py | 11 ++++----<br>
2 files changed, 35 insertions(+), 5 deletions(-)<br>
create mode 100644 bitbake/lib/toaster/<wbr>bldcontrol/migrations/0007_<wbr>brlayers_optional_gitinfo.py<br>
<br>
diff --git a/bitbake/lib/toaster/<wbr>bldcontrol/migrations/0007_<wbr>brlayers_optional_gitinfo.py b/bitbake/lib/toaster/<wbr>bldcontrol/migrations/0007_<wbr>brlayers_optional_gitinfo.py<br>
new file mode 100644<br>
index 0000000..4be42a4<br>
--- /dev/null<br>
+++ b/bitbake/lib/toaster/<wbr>bldcontrol/migrations/0007_<wbr>brlayers_optional_gitinfo.py<br>
@@ -0,0 +1,29 @@<br>
+# -*- coding: utf-8 -*-<br>
+from __future__ import unicode_literals<br>
+<br>
+from django.db import migrations, models<br>
+<br>
+<br>
+class Migration(migrations.<wbr>Migration):<br>
+<br>
+ dependencies = [<br>
+ ('bldcontrol', '0006_brlayer_local_source_<wbr>dir'),<br>
+ ]<br>
+<br>
+ operations = [<br>
+ migrations.AlterField(<br>
+ model_name='brlayer',<br>
+ name='commit',<br>
+ field=models.CharField(max_<wbr>length=254, null=True),<br>
+ ),<br>
+ migrations.AlterField(<br>
+ model_name='brlayer',<br>
+ name='dirpath',<br>
+ field=models.CharField(max_<wbr>length=254, null=True),<br>
+ ),<br>
+ migrations.AlterField(<br>
+ model_name='brlayer',<br>
+ name='giturl',<br>
+ field=models.CharField(max_<wbr>length=254, null=True),<br>
+ ),<br>
+ ]<br>
diff --git a/bitbake/lib/toaster/<wbr>bldcontrol/models.py b/bitbake/lib/toaster/<wbr>bldcontrol/models.py<br>
index 83b6969..409614b 100644<br>
--- a/bitbake/lib/toaster/<wbr>bldcontrol/models.py<br>
+++ b/bitbake/lib/toaster/<wbr>bldcontrol/models.py<br>
@@ -126,13 +126,14 @@ class BuildRequest(models.Model):<br>
# These tables specify the settings for running an actual build.<br>
# They MUST be kept in sync with the tables in orm.models.Project*<br>
<br>
+<br>
class BRLayer(models.Model):<br>
- req = models.ForeignKey(<wbr>BuildRequest)<br>
- name = models.CharField(max_length = 100)<br>
- giturl = models.CharField(max_length = 254)<br>
+ req = models.ForeignKey(<wbr>BuildRequest)<br>
+ name = models.CharField(max_length=<wbr>100)<br>
+ giturl = models.CharField(max_length=<wbr>254, null=True)<br>
local_source_dir = models.CharField(max_length=<wbr>254, null=True)<br>
- commit = models.CharField(max_length = 254)<br>
- dirpath = models.CharField(max_length = 254)<br>
+ commit = models.CharField(max_length=<wbr>254, null=True)<br>
+ dirpath = models.CharField(max_length=<wbr>254, null=True)<br>
layer_version = models.ForeignKey(Layer_<wbr>Version, null=True)<br>
<br>
class BRBitbake(models.Model):<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.7.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
bitbake-devel mailing list<br>
<a href="mailto:bitbake-devel@lists.openembedded.org">bitbake-devel@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/bitbake-devel" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/bitbake-devel</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>സുജിത് ഹരിദാസന്<br>Bangalore<br><Project>Contributor to KDE project<br></div><div><Project>Contributor to Yocto project<br></div><div><a href="http://fci.wikia.com/wiki/Anti-DRM-Campaign" target="_blank">http://fci.wikia.com/wiki/Anti-DRM-Campaign</a><br><Blog> <a href="http://sujithh.info" target="_blank">http://sujithh.info</a><br></div><div>C-x C-c<br></div></div></div></div></div>
</div></div></div></div></div></div></div>