diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-18 03:46:43 +0200 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2020-04-18 15:53:46 +0300 |
| commit | 25035bc2584a4aca6abee4381f35cf20e37110d5 (patch) | |
| tree | 02166fbc96c20868cac50df333912de2f4ba8d68 /modules/buildsystem/templates | |
| parent | 39d10d6e9ec2eeb832ff378c3612015e4c12860e (diff) | |
| download | puppet-25035bc2584a4aca6abee4381f35cf20e37110d5.tar puppet-25035bc2584a4aca6abee4381f35cf20e37110d5.tar.gz puppet-25035bc2584a4aca6abee4381f35cf20e37110d5.tar.bz2 puppet-25035bc2584a4aca6abee4381f35cf20e37110d5.tar.xz puppet-25035bc2584a4aca6abee4381f35cf20e37110d5.zip | |
remove --ignorearch option for urpmi
rationale:
it badly broke installing some packages with rpm-4.16 which add provides
for every generated package to the SRPM
See https://rpm.org/wiki/Releases/4.16.0
Basically reverting commit cc1079609497da5d5700e27f1076d57bf2b9282c and
its 2 followup fixups
Diffstat (limited to 'modules/buildsystem/templates')
| -rw-r--r-- | modules/buildsystem/templates/iurt.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/iurt.conf b/modules/buildsystem/templates/iurt.conf index e192dbed..77839b84 100644 --- a/modules/buildsystem/templates/iurt.conf +++ b/modules/buildsystem/templates/iurt.conf @@ -19,8 +19,6 @@ admin => 'mageia-sysadm@mageia.org', packager => 'Iurt the rebuild bot <mageia-sysadm@mageia.org>', sendmail => 0, - # This is ugly but currently needed to build armv5tl/armv7hl on same machine :( - urpmi_options => '--ignorearch', log_size_limit => '400M', build_timeout => { <%- build_timeout.keys.sort.each{|package| -%> |