aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2019-11-09 20:28:29 +0000
committerPascal Terjan <pterjan@mageia.org>2019-11-09 20:29:10 +0000
commit763a90e2947389be2c4fae11f33d1cb401aa837d (patch)
treec392a5ef71cf7fe1560d12b504499e308597ca42
parentdeddf63fc1266bd4f5acf66ec0f9e73b3a65f635 (diff)
downloadiurt-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.
-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 &");