particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

builder: make temp dir be configured

Browse source
This commit is contained in:
Yuming Zhu 2018-01-11 07:41:04 +00:00 • committed by Mike McLean
parent e399f69af4
commit d30f097301
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builder/kojid
View file

@ -733,7 +733,7 @@ class BuildRoot(object):
# mock 1.4+ /tmp is tmpfs mounted on each run, different # mock 1.4+ /tmp is tmpfs mounted on each run, different
# directory is needed for persistency # directory is needed for persistency
# 'within' is equivalent to broot.path_without_to_within(broot.tmpdir()) # 'within' is equivalent to broot.path_without_to_within(broot.tmpdir())
base = "/builddir/tmp" base = self.options.tmpdir
if within: if within:
return base return base
else: else:
@ -5579,6 +5579,7 @@ def get_options():
parser.add_option("--topdir", help="Specify topdir") parser.add_option("--topdir", help="Specify topdir")
parser.add_option("--topurl", help="Specify topurl") parser.add_option("--topurl", help="Specify topurl")
parser.add_option("--workdir", help="Specify workdir") parser.add_option("--workdir", help="Specify workdir")
parser.add_option("--tmpdir", help="Specify tmpdir")
parser.add_option("--pluginpath", help="Specify plugin search path") parser.add_option("--pluginpath", help="Specify plugin search path")
parser.add_option("--plugin", action="append", help="Load specified plugin") parser.add_option("--plugin", action="append", help="Load specified plugin")
parser.add_option("--mockdir", help="Specify mockdir") parser.add_option("--mockdir", help="Specify mockdir")
@ -5607,6 +5608,7 @@ def get_options():
'topdir': '/mnt/koji', 'topdir': '/mnt/koji',
'topurl': None, 'topurl': None,
'workdir': '/var/tmp/koji', 'workdir': '/var/tmp/koji',
'tmpdir': '/tmpdir',
'pluginpath': '/usr/lib/koji-builder-plugins', 'pluginpath': '/usr/lib/koji-builder-plugins',
'mockdir': '/var/lib/mock', 'mockdir': '/var/lib/mock',
'mockuser': 'kojibuilder', 'mockuser': 'kojibuilder',

3
builder/kojid.conf
View file

@ -14,6 +14,9 @@
; The directory root for temporary storage ; The directory root for temporary storage
; workdir=/tmp/koji ; workdir=/tmp/koji
; The temporary directory in buildroot
; tmpdir = /tmpdir
; The directory root for mock ; The directory root for mock
; mockdir=/var/lib/mock ; mockdir=/var/lib/mock