summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2017-08-20 21:02:54 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-23 12:07:42 +0100
commit254e2debe5705f4fe34307378a8c1457e4327d1c (patch)
tree7a993be76bff62bae6ec9f446db51340138dcde3 /bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
parent9bfe460934dd9bafcfab7bdf8cbbf7ad968e9026 (diff)
downloadpoky-254e2debe5705f4fe34307378a8c1457e4327d1c.tar.gz
bitbake: toaster: support custom Layer Index URL and fixture override
Toaster needs to allow the custom fixture file to specific an alternate Layer Index URL for users that host their own Layer Index Server via the 'CUSTOM_LAYERINDEX_SERVER' in 'custom.xml'. Toaster also needs to allow the ability to completely override the default fixture files, otherwise that content can leak into the custom environment (by default the custom fixture is an overlay that cannot remove existing values from the default fixture) via the 'CUSTOM_XML_ONLY' value in 'setting.xml'. [YOCTO #11938] (Bitbake rev: ac29d4a9078494544a2627d8b6b021096b49cb34) Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py')
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
index d11166ef53..582114ac97 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
@@ -75,7 +75,10 @@ class Command(BaseCommand):
75 call_command("loaddata", "settings") 75 call_command("loaddata", "settings")
76 template_conf = os.environ.get("TEMPLATECONF", "") 76 template_conf = os.environ.get("TEMPLATECONF", "")
77 77
78 if "poky" in template_conf: 78 if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0:
79 # only use the custom settings
80 pass
81 elif "poky" in template_conf:
79 print("Loading poky configuration") 82 print("Loading poky configuration")
80 call_command("loaddata", "poky") 83 call_command("loaddata", "poky")
81 else: 84 else: