mirror of
https://github.com/openSUSE/osc.git
synced 2025-02-19 08:42:11 +01:00
Tell the build script to disable repos/containers handling for normal builds
This disables following symlinks in the source copy. The options used are only supported in version 20250206 and above, so add a conflicts with older versions to the spec file as well.
This commit is contained in:
parent
0b4f39448d
commit
9b7fb4c2be
@ -104,6 +104,8 @@ Recommends: %{use_python_pkg}-keyring-keyutils
|
||||
Recommends: %{use_python_pkg}-zstandard
|
||||
|
||||
Recommends: %{obs_build_pkg}
|
||||
# need support for --repos-directory option
|
||||
Conflicts: %{obs_build_pkg} < 20250206
|
||||
Recommends: ca-certificates
|
||||
Recommends: diffstat
|
||||
Recommends: powerpc32
|
||||
|
@ -1273,9 +1273,9 @@ def main(apiurl, store, opts, argv):
|
||||
|
||||
# Make packages from buildinfo available as repos for kiwi/docker/fissile
|
||||
if build_type in ('kiwi', 'docker', 'podman', 'fissile', 'productcompose'):
|
||||
if os.path.exists('repos'):
|
||||
if os.path.lexists('repos'):
|
||||
shutil.rmtree('repos')
|
||||
if os.path.exists('containers'):
|
||||
if os.path.lexists('containers'):
|
||||
shutil.rmtree('containers')
|
||||
os.mkdir('repos')
|
||||
for i in bi.deps:
|
||||
@ -1349,6 +1349,10 @@ def main(apiurl, store, opts, argv):
|
||||
else:
|
||||
os.symlink(path, tffn)
|
||||
|
||||
else:
|
||||
buildargs.append("--repos-directory=-")
|
||||
buildargs.append("--containers-directory=-")
|
||||
|
||||
if build_type == 'kiwi':
|
||||
# Is a obsrepositories tag used?
|
||||
try:
|
||||
|
Loading…
x
Reference in New Issue
Block a user