diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | lib/Iurt/Ulri.pm | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -1,5 +1,5 @@ -- ulri: always call setarch rather than only when target is i586, this allows - to build for 32bit arm on aarch64 for example. +- ulri: call setarch for all 32bit targets rather than only when target is + i586, this allows to build for 32bit arm on aarch64. - emi: store in the .upload which architectures were uploaded to know if non mandatory ones are done. diff --git a/lib/Iurt/Ulri.pm b/lib/Iurt/Ulri.pm index d085514..c9ec44e 100755 --- a/lib/Iurt/Ulri.pm +++ b/lib/Iurt/Ulri.pm @@ -80,8 +80,10 @@ sub build_package { plog('DEBUG', "Will compile only with media $media_to_add"); $cmd =~ s!__MEDIA__!$media_to_add!g; - #- force the requested arch, this allows to build 32 bits package on 64 bit hosts - $cmd = "setarch $arch $cmd"; + #- force 32bit if needed, this allows to build 32 bits package on 64 bit hosts + if ($arch =~ /^(i.86|armv5tl|armv7hl)/) { + $cmd = "setarch linux32 $cmd"; + } plog('DEBUG', "Build $pkgs"); ssh($remote, "'echo PID=\$\$; exec $cmd $pkgs &>$prefix_dir/log/botcmd.\$(date +%s).\$(hostname -s).log' > $temp &"); |