#1115 ostree_installer: Pass --buildarch to lorax
Merged 3 months ago by lsedlar. Opened 3 months ago by lsedlar.
lsedlar/pungi ostree-lorax-arch  into  master

@@ -9,6 +9,7 @@ 

  

  from .base import ConfigGuardedPhase, PhaseLoggerMixin

  from .. import util

+ from ..arch import get_valid_arches

  from ..util import get_volid, get_repo_urls, version_generator, translate_path

  from ..wrappers import kojiwrapper, iso, lorax, scm

  

@@ -166,6 +167,7 @@ 

              variant=variant.uid,

              nomacboot=True,

              volid=volid,

+             buildarch=get_valid_arches(arch)[0],

              buildinstallpackages=config.get('installpkgs'),

              add_template=self._get_templates(config, 'add_template'),

              add_arch_template=self._get_templates(config, 'add_arch_template'),

@@ -135,6 +135,7 @@ 

          if isfinal:

              lorax_cmd.append('--isfinal')

  

+         lorax_cmd.append("--buildarch=x86_64")

          lorax_cmd.append('--volid=test-Everything-x86_64')

  

          if extra:

This should tell lorax what arch to use and avoids fragile detection based on contents of source repo.

Related: https://pagure.io/teamsilverblue/issue/67

CC @adamwill

rebased onto da1ea83

3 months ago

Pull-Request has been merged by lsedlar

3 months ago