SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow environment variables to overwrite proxy, target, machine, distro

Browse Source 
Changing even simple settings like target or machine requires the
creation of additional configuration files. This does not scale well.

This patch allows the target, machine and distro to be overwritten by
environment variables (called KAS_TARGET, KAS_MACHINE and KAS_DISTRO
respectively).

It also fixes how the environment variables for the proxy settings are
handled. Currently the settings in the config files overwrite the proxy
settings from the environment, but since that would be inconsistent this
patch switches that around. With this patch the environment overwrites
the proxy settings in the configuration file.

Signed-off-by: Claudius Heine <ch@denx.de>
This commit is contained in:
Claudius Heine 2017-06-28 14:48:39 +02:00 committed by Daniel Wagner
parent 0bdd7a8d52
commit 8ba1ce52e8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kas/config.py
View File

@ -103,11 +103,12 @@ class Config:
"""
Returns the proxy settings
"""
return self._config.get('proxy_config', {
'http_proxy': os.environ.get('http_proxy', ''),
'https_proxy': os.environ.get('https_proxy', ''),
'no_proxy': os.environ.get('no_proxy', '')
})
proxy_config = self._config.get('proxy_config', {})
return {var_name: os.environ.get(var_name,
proxy_config.get(var_name, ''))
for var_name in ['http_proxy',
'https_proxy',
'no_proxy']}
def get_repos(self):
"""
@ -145,7 +146,9 @@ class Config:
"""
Return the bitbake target
"""
return self._config.get('target', 'core-image-minimal')
return os.environ.get('KAS_TARGET',
self._config.get('target',
'core-image-minimal'))
def get_bblayers_conf_header(self):
"""
@ -163,13 +166,15 @@ class Config:
"""
Returns the machine
"""
return self._config.get('machine', 'qemu')
return os.environ.get('KAS_MACHINE',
self._config.get('machine', 'qemu'))
def get_distro(self):
"""
Returns the distro
"""
return self._config.get('distro', 'poky')
return os.environ.get('KAS_DISTRO',
self._config.get('distro', 'poky'))
def get_gitlabci_config(self):
"""