* [PATCH 0/1] toaster: support custom Layer Index URL and fixture override
@ 2017-08-21 4:02 David Reyna
2017-08-21 4:02 ` [PATCH 1/1] " David Reyna
0 siblings, 1 reply; 2+ messages in thread
From: David Reyna @ 2017-08-21 4:02 UTC (permalink / raw)
To: bitbake-devel
From: David Reyna <David.Reyna@windriver.com>
These two simple changes help enable users and commercial partners to attach their
custom layer index servers to Toaster, plus more control over the custom content
for Toaster projects.
The following changes since commit 04dc76713b57f28457742dd863caa663591d4866:
devtool/copy_buildsystem: adds meta-skeleton layer in the eSDK installation. (2017-08-19 22:15:39 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib dreyna/submit/dreyna/toaster/custom_layer_index_11957
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/submit/dreyna/toaster/custom_layer_index_11957
David Reyna (1):
toaster: support custom Layer Index URL and fixture override
lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++-
lib/toaster/orm/management/commands/lsupdates.py | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/1] toaster: support custom Layer Index URL and fixture override
2017-08-21 4:02 [PATCH 0/1] toaster: support custom Layer Index URL and fixture override David Reyna
@ 2017-08-21 4:02 ` David Reyna
0 siblings, 0 replies; 2+ messages in thread
From: David Reyna @ 2017-08-21 4:02 UTC (permalink / raw)
To: bitbake-devel
From: David Reyna <David.Reyna@windriver.com>
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]
Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++-
lib/toaster/orm/management/commands/lsupdates.py | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/toaster/bldcontrol/management/commands/checksettings.py b/lib/toaster/bldcontrol/management/commands/checksettings.py
index d11166e..582114a 100644
--- a/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/lib/toaster/bldcontrol/management/commands/checksettings.py
@@ -75,7 +75,10 @@ class Command(BaseCommand):
call_command("loaddata", "settings")
template_conf = os.environ.get("TEMPLATECONF", "")
- if "poky" in template_conf:
+ if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0:
+ # only use the custom settings
+ pass
+ elif "poky" in template_conf:
print("Loading poky configuration")
call_command("loaddata", "poky")
else:
diff --git a/lib/toaster/orm/management/commands/lsupdates.py b/lib/toaster/orm/management/commands/lsupdates.py
index 0b0d4ff..fac5733 100644
--- a/lib/toaster/orm/management/commands/lsupdates.py
+++ b/lib/toaster/orm/management/commands/lsupdates.py
@@ -81,6 +81,8 @@ class Command(BaseCommand):
os.system('setterm -cursor off')
self.apiurl = DEFAULT_LAYERINDEX_SERVER
+ if ToasterSetting.objects.filter(name='CUSTOM_LAYERINDEX_SERVER').count() == 1:
+ self.apiurl = ToasterSetting.objects.get(name = 'CUSTOM_LAYERINDEX_SERVER').value
assert self.apiurl is not None
try:
@@ -92,7 +94,9 @@ class Command(BaseCommand):
proxy_settings = os.environ.get("http_proxy", None)
- def _get_json_response(apiurl=DEFAULT_LAYERINDEX_SERVER):
+ def _get_json_response(apiurl=None):
+ if None == apiurl:
+ apiurl=self.apiurl
http_progress = Spinner()
http_progress.start()
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-21 4:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-21 4:02 [PATCH 0/1] toaster: support custom Layer Index URL and fixture override David Reyna
2017-08-21 4:02 ` [PATCH 1/1] " David Reyna
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.