diff options
| author | Awais Belal <awais_belal@mentor.com> | 2018-08-26 15:33:29 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 10:32:08 +0100 |
| commit | 3b7ec343713f747837587f6fec743af83e82003f (patch) | |
| tree | f0365ea7ede3c39dbc8ed973719195a5418c2356 /bitbake | |
| parent | bc344a4285c2af8f66794bda899b4ee8434b4b58 (diff) | |
| download | poky-3b7ec343713f747837587f6fec743af83e82003f.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: 55333f1c3ded1c53120e6cb32b440cc707521e2b)
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>
Diffstat (limited to 'bitbake')
| -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: |
