slapos/obs: Unhardcode x86_64 arch

24d07af9 · Rafael Monnerat · fdcdd4fc · 24d07af9
Commit 24d07af9 authored Nov 26, 2018 by Rafael Monnerat
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

component/slapos/obs.cfg component/slapos/obs.cfg +4 -4

No files found.
--- a/component/slapos/obs.cfg
+++ b/component/slapos/obs.cfg
@@ -159,11 +159,11 @@ environment +=
 perl-PERL5LIB=${perl:location}/lib/5.26.1/

 pre-configure =
-  sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.26.1/x86_64-linux-thread-multi/Config.pm
-  sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.26.1/x86_64-linux-thread-multi/Config.pm
+  sed -i "s#'/opt/slapos/parts/perl#'${perl:location}#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm
+  sed -i "s#'/opt/slapos/parts/site_perl#'${buildout:destdir}/parts/site_perl#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm
 post-install =
-  sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.26.1/x86_64-linux-thread-multi/Config.pm
-  sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.26.1/x86_64-linux-thread-multi/Config.pm
+  sed -i "s#'${perl:location}#'/opt/slapos/parts/perl#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm
+  sed -i "s#'${buildout:destdir}/parts/site_perl#'/opt/slapos/parts/site_perl#" ${perl:location}/lib/5.26.1/*-linux-thread-multi/Config.pm

 [perl]
 location = ${buildout:destdir}/parts/perl