aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rwxr-xr-xlib/Iurt/Ulri.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index f70b9fc..4cc8ecc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- ulri: always call setarch rather than only when target is i586, this allows
+ to build for 32bit arm on aarch64 for example.
- 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 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 &");