MIRRORS/yocto-autobuilder-helper
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder-helper.git synced 2025-07-19 20:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

setup-config: Clean up stepnum handling and drop debug

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-01-15 23:42:13 +00:00
parent 885d2d8c91
commit 0495bf45cc
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/setup-config
View File

@ -47,7 +47,7 @@ def configtrue(name, config):
# Get a configuration variable, check overrides, first, the defaults # Get a configuration variable, check overrides, first, the defaults
def getconfigvar(name, config, target, stepnum): def getconfigvar(name, config, target, stepnum):
step = "step" + stepnum step = "step" + str(stepnum)
if target in config['overrides']: if target in config['overrides']:
if step in config['overrides'][target] and name in config['overrides'][target][step]: if step in config['overrides'][target] and name in config['overrides'][target][step]:
return config['overrides'][target][step][name] return config['overrides'][target][step][name]
@ -59,7 +59,7 @@ def getconfigvar(name, config, target, stepnum):
def getconfiglist(name, config, target, stepnum): def getconfiglist(name, config, target, stepnum):
ret = [] ret = []
step = "step" + stepnum step = "step" + str(stepnum)
if target in config['overrides']: if target in config['overrides']:
if step in config['overrides'][target] and name in config['overrides'][target][step]: if step in config['overrides'][target] and name in config['overrides'][target][step]:
ret.extend(config['overrides'][target][step][name]) ret.extend(config['overrides'][target][step][name])
@ -93,11 +93,11 @@ sdkextraconf = os.path.join(builddir, "conf", "sdk-extra.conf")
if os.path.exists(sdkextraconf): if os.path.exists(sdkextraconf):
os.remove(sdkextraconf) os.remove(sdkextraconf)
distro = getconfigvar("DISTRO", ourconfig, target) distro = getconfigvar("DISTRO", ourconfig, target, stepnum)
if distro and distro != "None": if distro and distro != "None":
variables.append('DISTRO = "%s"' % distro) variables.append('DISTRO = "%s"' % distro)
extravars = getconfiglist("extravars", ourconfig, target) extravars = getconfiglist("extravars", ourconfig, target, stepnum)
if extravars: if extravars:
variables.extend(extravars) variables.extend(extravars)
@ -117,13 +117,10 @@ if contains(["BUILD_HISTORY_DIR", "build-history-targets", "BUILD_HISTORY_REPO"]
variables.append('BUILDHISTORY_DIR = "%s"' % bh_path) variables.append('BUILDHISTORY_DIR = "%s"' % bh_path)
variables.append('BUILDHISTORY_PUSH_REPO = "%s %s:%s"' % (remoterepo, remotebranch, remotebranch)) variables.append('BUILDHISTORY_PUSH_REPO = "%s %s:%s"' % (remoterepo, remotebranch, remotebranch))
print("Writing %s" % autoconf) print("Writing %s with contents:" % autoconf)
with open(autoconf, "w") as f: with open(autoconf, "w") as f:
for v in variables: for v in variables:
print(v) print(v)
f.write(v + "\n") f.write(v + "\n")
print(str(ourconfig))
print("setup-config called with %s" % " ".join(sys.argv))