diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-13 22:03:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 08:35:07 +0100 |
commit | 27fa181897b54ee5a6151faf836df90a60163292 (patch) | |
tree | f467b8789de2b1a29c6ea95851e87ab7748b34a2 | |
parent | af04a52bf7d7ae94c187e85028a80dee6d7853f0 (diff) | |
download | openembedded-core-contrib-27fa181897b54ee5a6151faf836df90a60163292.tar.gz |
bitbake: toaster: Remove mismerged files
Another patch added migrations in the correct location (different date) so
these in the wrong directory can be removed.
(Bitbake rev: 8aa84abc952835792db1614b6fe2305ab9dca9e1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py | 34 | ||||
-rw-r--r-- | bitbake/bitbake/lib/toaster/orm/migrations/0007_auto_20160509_0946.py | 89 |
2 files changed, 0 insertions, 123 deletions
diff --git a/bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py b/bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py deleted file mode 100644 index 4a70e2d8e8..0000000000 --- a/bitbake/bitbake/lib/toaster/bldcontrol/migrations/0004_auto_20160509_0946.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bldcontrol', '0003_add_cancelling_state'), - ] - - operations = [ - migrations.AlterField( - model_name='buildenvironment', - name='bbstate', - field=models.IntegerField(choices=[(0, 'stopped'), (1, 'started')], default=0), - ), - migrations.AlterField( - model_name='buildenvironment', - name='betype', - field=models.IntegerField(choices=[(0, 'local')]), - ), - migrations.AlterField( - model_name='buildenvironment', - name='lock', - field=models.IntegerField(choices=[(0, 'free'), (1, 'lock'), (2, 'running')], default=0), - ), - migrations.AlterField( - model_name='buildrequest', - name='state', - field=models.IntegerField(choices=[(0, 'created'), (1, 'queued'), (2, 'in progress'), (3, 'completed'), (4, 'failed'), (5, 'deleted'), (6, 'cancelling'), (7, 'archive')], default=0), - ), - ] diff --git a/bitbake/bitbake/lib/toaster/orm/migrations/0007_auto_20160509_0946.py b/bitbake/bitbake/lib/toaster/orm/migrations/0007_auto_20160509_0946.py deleted file mode 100644 index d866105f19..0000000000 --- a/bitbake/bitbake/lib/toaster/orm/migrations/0007_auto_20160509_0946.py +++ /dev/null @@ -1,89 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('orm', '0006_add_cancelled_state'), - ] - - operations = [ - migrations.AlterField( - model_name='build', - name='outcome', - field=models.IntegerField(choices=[(0, 'Succeeded'), (1, 'Failed'), (2, 'In Progress'), (3, 'Cancelled')], default=2), - ), - migrations.AlterField( - model_name='helptext', - name='area', - field=models.IntegerField(choices=[(0, 'variable')]), - ), - migrations.AlterField( - model_name='layer', - name='summary', - field=models.TextField(null=True, help_text='One-line description of the layer', default=None), - ), - migrations.AlterField( - model_name='layer_version', - name='local_path', - field=models.FilePathField(max_length=1024, default='/'), - ), - migrations.AlterField( - model_name='layersource', - name='sourcetype', - field=models.IntegerField(choices=[(0, 'local'), (1, 'layerindex'), (2, 'imported')]), - ), - migrations.AlterField( - model_name='logmessage', - name='level', - field=models.IntegerField(choices=[(0, 'info'), (1, 'warn'), (2, 'error'), (3, 'critical'), (-1, 'toaster exception')], default=0), - ), - migrations.AlterField( - model_name='package', - name='installed_name', - field=models.CharField(max_length=100, default=''), - ), - migrations.AlterField( - model_name='package_dependency', - name='dep_type', - field=models.IntegerField(choices=[(0, 'depends'), (1, 'depends'), (3, 'recommends'), (2, 'recommends'), (4, 'suggests'), (5, 'provides'), (6, 'replaces'), (7, 'conflicts')]), - ), - migrations.AlterField( - model_name='recipe_dependency', - name='dep_type', - field=models.IntegerField(choices=[(0, 'depends'), (1, 'rdepends')]), - ), - migrations.AlterField( - model_name='release', - name='branch_name', - field=models.CharField(max_length=50, default=''), - ), - migrations.AlterField( - model_name='releasedefaultlayer', - name='layer_name', - field=models.CharField(max_length=100, default=''), - ), - migrations.AlterField( - model_name='target_file', - name='inodetype', - field=models.IntegerField(choices=[(1, 'regular'), (2, 'directory'), (3, 'symlink'), (4, 'socket'), (5, 'fifo'), (6, 'character'), (7, 'block')]), - ), - migrations.AlterField( - model_name='task', - name='outcome', - field=models.IntegerField(choices=[(-1, 'Not Available'), (0, 'Succeeded'), (1, 'Covered'), (2, 'Cached'), (3, 'Prebuilt'), (4, 'Failed'), (5, 'Empty')], default=-1), - ), - migrations.AlterField( - model_name='task', - name='script_type', - field=models.IntegerField(choices=[(0, 'N/A'), (2, 'Python'), (3, 'Shell')], default=0), - ), - migrations.AlterField( - model_name='task', - name='sstate_result', - field=models.IntegerField(choices=[(0, 'Not Applicable'), (1, 'File not in cache'), (2, 'Failed'), (3, 'Succeeded')], default=0), - ), - ] |