robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Toggle multilib per variant

Browse source 
There is now a single option `multilib`, that maps variants and arches
to multilib methods. This replaces old `multilib_methods` option.

Multilib arches are implicitly deduced instead of using the
`multilib_arches` option.

The test compose is updated to only enable multilib on Server and its
addons.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2016-01-20 12:53:08 +01:00
parent 6e0f6ee73e
commit 8b4ad1ea02
12 changed files with 61 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pungi/phases/gather/methods/method_deps.py
View file

@ -20,13 +20,12 @@ import tempfile
from kobo.shortcuts import run
from pungi.util import rmtree
from pungi.util import rmtree, get_arch_variant_data
from pungi.wrappers.pungi import PungiWrapper
from pungi.arch import tree_arch_to_yum_arch
import pungi.phases.gather
import pungi.phases.gather.method
@ -116,11 +115,7 @@ def resolve_deps(compose, arch, variant):
compose.log_info("[BEGIN] %s" % msg)
pungi_conf = compose.paths.work.pungi_conf(arch, variant)
multilib_methods = compose.conf.get("multilib_methods", None)
multilib_methods = compose.conf.get("multilib_methods", None)
is_multilib = arch in compose.conf["multilib_arches"]
if not is_multilib:
multilib_methods = None
multilib_methods = get_arch_variant_data(compose.conf, 'multilib', arch, variant)
greedy_method = compose.conf.get("greedy_method", "none")