[bitbake-devel] [PATCH 8/9] toaster: Allow git information to be null for BRLayer

[sujith h]

Hi,

Seems like the migration changes are not merged upstream. Only models
changes are there.

Thanks,
Sujith H

On Mon, Aug 22, 2016 at 9:12 PM, Elliot Smith <elliot.smith at intel.com>
wrote:

> From: Michael Wood <michael.g.wood at intel.com>
>
> We no longer only deal with layers that have their source in a gir
> repository, we also allow for local directories too so update the
> BRLayer model to reflect this.
>
> Signed-off-by: Michael Wood <michael.g.wood at intel.com>
> Signed-off-by: Elliot Smith <elliot.smith at intel.com>
> ---
>  .../migrations/0007_brlayers_optional_gitinfo.py   | 29
> ++++++++++++++++++++++
>  bitbake/lib/toaster/bldcontrol/models.py           | 11 ++++----
>  2 files changed, 35 insertions(+), 5 deletions(-)
>  create mode 100644 bitbake/lib/toaster/bldcontrol/migrations/0007_
> brlayers_optional_gitinfo.py
>
> diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0007_brlayers_optional_gitinfo.py
> b/bitbake/lib/toaster/bldcontrol/migrations/0007_
> brlayers_optional_gitinfo.py
> new file mode 100644
> index 0000000..4be42a4
> --- /dev/null
> +++ b/bitbake/lib/toaster/bldcontrol/migrations/0007_
> brlayers_optional_gitinfo.py
> @@ -0,0 +1,29 @@
> +# -*- coding: utf-8 -*-
> +from __future__ import unicode_literals
> +
> +from django.db import migrations, models
> +
> +
> +class Migration(migrations.Migration):
> +
> +    dependencies = [
> +        ('bldcontrol', '0006_brlayer_local_source_dir'),
> +    ]
> +
> +    operations = [
> +        migrations.AlterField(
> +            model_name='brlayer',
> +            name='commit',
> +            field=models.CharField(max_length=254, null=True),
> +        ),
> +        migrations.AlterField(
> +            model_name='brlayer',
> +            name='dirpath',
> +            field=models.CharField(max_length=254, null=True),
> +        ),
> +        migrations.AlterField(
> +            model_name='brlayer',
> +            name='giturl',
> +            field=models.CharField(max_length=254, null=True),
> +        ),
> +    ]
> diff --git a/bitbake/lib/toaster/bldcontrol/models.py
> b/bitbake/lib/toaster/bldcontrol/models.py
> index 83b6969..409614b 100644
> --- a/bitbake/lib/toaster/bldcontrol/models.py
> +++ b/bitbake/lib/toaster/bldcontrol/models.py
> @@ -126,13 +126,14 @@ class BuildRequest(models.Model):
>  # These tables specify the settings for running an actual build.
>  # They MUST be kept in sync with the tables in orm.models.Project*
>
> +
>  class BRLayer(models.Model):
> -    req         = models.ForeignKey(BuildRequest)
> -    name        = models.CharField(max_length = 100)
> -    giturl      = models.CharField(max_length = 254)
> +    req = models.ForeignKey(BuildRequest)
> +    name = models.CharField(max_length=100)
> +    giturl = models.CharField(max_length=254, null=True)
>      local_source_dir = models.CharField(max_length=254, null=True)
> -    commit      = models.CharField(max_length = 254)
> -    dirpath     = models.CharField(max_length = 254)
> +    commit = models.CharField(max_length=254, null=True)
> +    dirpath = models.CharField(max_length=254, null=True)
>      layer_version = models.ForeignKey(Layer_Version, null=True)
>
>  class BRBitbake(models.Model):
> --
> 2.7.4
>
> --
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
>



-- 
സുജിത് ഹരിദാസന്
Bangalore
<Project>Contributor to KDE project
<Project>Contributor to Yocto project
http://fci.wikia.com/wiki/Anti-DRM-Campaign
<Blog> http://sujithh.info
C-x C-c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/bitbake-devel/attachments/20160916/42fd1990/attachment-0002.html>