From: Awais Belal Date: Sun, 26 Aug 2018 22:33:29 +0000 (-0700) Subject: bitbake: toaster/checksettings: allow CUSTOM_XML_ONLY setting through env X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b7ec343713f747837587f6fec743af83e82003f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 823c6f154ad..14298d9dafc 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): print("Loading default settings") call_command("loaddata", "settings") template_conf = os.environ.get("TEMPLATECONF", "") + custom_xml_only = os.environ.get("CUSTOM_XML_ONLY") - if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0: + if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0 or (not custom_xml_only == None): # only use the custom settings pass elif "poky" in template_conf: