diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-03-30 15:21:19 -0500 |
commit | b4a027550acf2c1051c34f997b8e7e845017af4b (patch) | |
tree | 9e38d3c17b42cb1e6765620a87e908973a93c821 /yocto-poky/bitbake/lib/toaster/toastermain | |
parent | 2fe86d90044af218ced8f42fdded6b136f1046d2 (diff) | |
parent | f1e5d6968976c2341c6d554bfcc8895f1b33c26b (diff) | |
download | blackbird-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.tar.gz blackbird-openbmc-b4a027550acf2c1051c34f997b8e7e845017af4b.zip |
Merge commit 'f1e5d6968976c2341c6d554bfcc8895f1b33c26b' from yocto-2.0.1
Diffstat (limited to 'yocto-poky/bitbake/lib/toaster/toastermain')
-rw-r--r-- | yocto-poky/bitbake/lib/toaster/toastermain/settings.py | 11 | ||||
-rw-r--r-- | yocto-poky/bitbake/lib/toaster/toastermain/urls.py | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/yocto-poky/bitbake/lib/toaster/toastermain/settings.py b/yocto-poky/bitbake/lib/toaster/toastermain/settings.py index b149a5ed8..b28ddb2b0 100644 --- a/yocto-poky/bitbake/lib/toaster/toastermain/settings.py +++ b/yocto-poky/bitbake/lib/toaster/toastermain/settings.py @@ -23,6 +23,11 @@ import os, re +# Temporary toggle for Image customisation +CUSTOM_IMAGE = False +if os.environ.get("CUSTOM_IMAGE", None) is not None: + CUSTOM_IMAGE = True + DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -87,11 +92,9 @@ if 'DATABASE_URL' in os.environ: else: raise Exception("FIXME: Please implement missing database url schema for url: %s" % dburl) - +BUILD_MODE = False if 'TOASTER_MANAGED' in os.environ and os.environ['TOASTER_MANAGED'] == "1": - MANAGED = True -else: - MANAGED = False + BUILD_MODE = True # Allows current database settings to be exported as a DATABASE_URL environment variable value diff --git a/yocto-poky/bitbake/lib/toaster/toastermain/urls.py b/yocto-poky/bitbake/lib/toaster/toastermain/urls.py index 521588a6a..6c4a953b4 100644 --- a/yocto-poky/bitbake/lib/toaster/toastermain/urls.py +++ b/yocto-poky/bitbake/lib/toaster/toastermain/urls.py @@ -60,7 +60,7 @@ if toastermain.settings.DEBUG_PANEL_ENABLED: #logger.info("Enabled django_toolbar extension") -if toastermain.settings.MANAGED: +if toastermain.settings.BUILD_MODE: urlpatterns = [ # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), |