diff options
author | Pascal Terjan <pterjan@mageia.org> | 2019-11-09 20:28:29 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@mageia.org> | 2019-11-09 20:29:10 +0000 |
commit | 763a90e2947389be2c4fae11f33d1cb401aa837d (patch) | |
tree | c392a5ef71cf7fe1560d12b504499e308597ca42 /lib | |
parent | deddf63fc1266bd4f5acf66ec0f9e73b3a65f635 (diff) | |
download | iurt-763a90e2947389be2c4fae11f33d1cb401aa837d.tar iurt-763a90e2947389be2c4fae11f33d1cb401aa837d.tar.gz iurt-763a90e2947389be2c4fae11f33d1cb401aa837d.tar.bz2 iurt-763a90e2947389be2c4fae11f33d1cb401aa837d.tar.xz iurt-763a90e2947389be2c4fae11f33d1cb401aa837d.zip |
Always call setarch
It used to be called when target is i586 to allow building for i586 on
x86_64. Calling it on all architectures should have no impact when the
architecture is the same, and this allows to build also for 32bit arm
on 64bit arm host.
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/Iurt/Ulri.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/Iurt/Ulri.pm b/lib/Iurt/Ulri.pm index ce9d104..d085514 100755 --- a/lib/Iurt/Ulri.pm +++ b/lib/Iurt/Ulri.pm @@ -80,10 +80,8 @@ sub build_package { plog('DEBUG', "Will compile only with media $media_to_add"); $cmd =~ s!__MEDIA__!$media_to_add!g; - #- allow x86_64 hosts to build i586 packages - if ($arch eq 'i586') { - $cmd = "setarch i586 $cmd"; - } + #- force the requested arch, this allows to build 32 bits package on 64 bit hosts + $cmd = "setarch $arch $cmd"; plog('DEBUG', "Build $pkgs"); ssh($remote, "'echo PID=\$\$; exec $cmd $pkgs &>$prefix_dir/log/botcmd.\$(date +%s).\$(hostname -s).log' > $temp &"); |