From 1c252c7783a276cba265ef6d5ded205aeacb169f Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Thu, 1 Oct 2015 16:44:45 +0200 Subject: [PATCH] chroot arch: fix regression, make x86_64 work again Signed-off-by: Tobias Ulmer --- Changelog | 1 + local/e2tool.lua | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 2cfbe8b..e2c58be 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ NEXT: + * Fix regression preventing use of x86_64 chroot * Fix hashcache problem causing an incorrect BuildID * Reset all signal handlers to their default values * Fix rotating logs when the result name contains a dash diff --git a/local/e2tool.lua b/local/e2tool.lua index 2c28c2c..16b7fbe 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -1295,8 +1295,11 @@ function e2tool.collect_project_info(info, skip_load_config) if not info.chroot_call_prefix[info.project.chroot_arch] then e:append("chroot_arch is set to an invalid value") end - if info.project.chroot_arch == "x86_64" and - e2lib.host_system_arch ~= "x86_64" then + local host_system_arch, re = e2lib.get_sys_arch() + if not host_system_arch then + e:cat(re) + elseif info.project.chroot_arch == "x86_64" and + host_system_arch ~= "x86_64" then e:append("running on x86_32: switching to x86_64 mode is impossible.") end if e:getcount() > 1 then -- 2.39.5