diff options
author | Awais Belal <awais_belal@mentor.com> | 2018-09-05 22:26:45 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-10 12:15:04 +0100 |
commit | 1ba6706ce27e8416c962361682d2cdd676de3a2e (patch) | |
tree | 70a1bf4f74ad80696fffb0accc0e8b42b6f259fa | |
parent | e4c6642adc018c99033b400f80df8ad76560a97c (diff) | |
download | poky-1ba6706ce27e8416c962361682d2cdd676de3a2e.tar.gz |
bitbake: toaster/checksettings: allow CUSTOM_XML_ONLY setting through env
This change allows the CUSTOM_XML_ONLY toaster setting to be
provided through the environment so the user can do this without
mingling with the settings.xml, for scenarios where modifying
settings.xml is not achievable.
[YOCTO #12891]
(Bitbake rev: 87060a84e74125be10db062da3032e9b01f5dc96)
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 823c6f154a..14298d9daf 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | |||
@@ -74,8 +74,9 @@ class Command(BaseCommand): | |||
74 | print("Loading default settings") | 74 | print("Loading default settings") |
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 | custom_xml_only = os.environ.get("CUSTOM_XML_ONLY") | ||
77 | 78 | ||
78 | if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0: | 79 | if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0 or (not custom_xml_only == None): |
79 | # only use the custom settings | 80 | # only use the custom settings |
80 | pass | 81 | pass |
81 | elif "poky" in template_conf: | 82 | elif "poky" in template_conf: |