summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-06-16 16:00:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-26 09:27:33 +0100
commitdf48243970fac633586eb99c9baf3090123c681c (patch)
treea616118bed5fa9831a5ddbf0033cc5833d51e80a
parent62288a66896416beaef1d85aeefc8dab0835f4f8 (diff)
downloadpoky-df48243970fac633586eb99c9baf3090123c681c.tar.gz
bitbake: toaster: split orm app into it's own module and app
The orm application was also the django application to collect the build information. Splitting this module up into it's functional parts. orm for the data module and bldcollector for build collection data. (Bitbake rev: 8ca10764ffd6cfec12cbfeabf240d81213a07845) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcollector/__init__.py0
-rw-r--r--bitbake/lib/toaster/bldcollector/admin.py (renamed from bitbake/lib/toaster/orm/admin.py)3
-rw-r--r--bitbake/lib/toaster/bldcollector/urls.py (renamed from bitbake/lib/toaster/orm/urls.py)3
-rw-r--r--bitbake/lib/toaster/bldcollector/views.py (renamed from bitbake/lib/toaster/orm/views.py)0
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py2
5 files changed, 3 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/bldcollector/__init__.py b/bitbake/lib/toaster/bldcollector/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/bitbake/lib/toaster/bldcollector/__init__.py
diff --git a/bitbake/lib/toaster/orm/admin.py b/bitbake/lib/toaster/bldcollector/admin.py
index 706e517e0e..c1f85d73d5 100644
--- a/bitbake/lib/toaster/orm/admin.py
+++ b/bitbake/lib/toaster/bldcollector/admin.py
@@ -1,6 +1,6 @@
1from django.contrib import admin 1from django.contrib import admin
2from django.contrib.admin.filters import RelatedFieldListFilter 2from django.contrib.admin.filters import RelatedFieldListFilter
3from .models import BitbakeVersion, Release, LayerSource, ToasterSetting 3from orm.models import BitbakeVersion, Release, LayerSource, ToasterSetting
4from django.forms.widgets import Textarea 4from django.forms.widgets import Textarea
5from django import forms 5from django import forms
6import django.db.models as models 6import django.db.models as models
@@ -31,4 +31,3 @@ admin.site.register(LayerSource, LayerSourceAdmin)
31admin.site.register(BitbakeVersion, BitbakeVersionAdmin) 31admin.site.register(BitbakeVersion, BitbakeVersionAdmin)
32admin.site.register(Release, ReleaseAdmin) 32admin.site.register(Release, ReleaseAdmin)
33admin.site.register(ToasterSetting, ToasterSettingAdmin) 33admin.site.register(ToasterSetting, ToasterSettingAdmin)
34
diff --git a/bitbake/lib/toaster/orm/urls.py b/bitbake/lib/toaster/bldcollector/urls.py
index 961bc19070..144387b56a 100644
--- a/bitbake/lib/toaster/orm/urls.py
+++ b/bitbake/lib/toaster/bldcollector/urls.py
@@ -20,8 +20,7 @@
20from django.conf.urls import patterns, include, url 20from django.conf.urls import patterns, include, url
21from django.views.generic import RedirectView 21from django.views.generic import RedirectView
22 22
23urlpatterns = patterns('orm.views', 23urlpatterns = patterns('bldcollector.views',
24 # landing point for pushing a bitbake_eventlog.json file to this toaster instace 24 # landing point for pushing a bitbake_eventlog.json file to this toaster instace
25 url(r'^eventfile$', 'eventfile', name='eventfile'), 25 url(r'^eventfile$', 'eventfile', name='eventfile'),
26 ) 26 )
27
diff --git a/bitbake/lib/toaster/orm/views.py b/bitbake/lib/toaster/bldcollector/views.py
index f32fa4d225..f32fa4d225 100644
--- a/bitbake/lib/toaster/orm/views.py
+++ b/bitbake/lib/toaster/bldcollector/views.py
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index 60e80de2f6..c72a90411b 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -268,7 +268,7 @@ INSTALLED_APPS = (
268 # Uncomment the next line to enable admin documentation: 268 # Uncomment the next line to enable admin documentation:
269 # 'django.contrib.admindocs', 269 # 'django.contrib.admindocs',
270 'django.contrib.humanize', 270 'django.contrib.humanize',
271 'orm', 271 'bldcollector',
272 'toastermain', 272 'toastermain',
273 'south', 273 'south',
274) 274)