Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 01 Aug 2020 13:17:26
Message-Id: 1596287835.5d473cb2929e2b32a3d37becdd4293e483959eb2.mgorny@gentoo
1 commit: 5d473cb2929e2b32a3d37becdd4293e483959eb2
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 1 11:01:34 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 1 13:17:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d473cb2
7
8 kernel-install.eclass: Pass '-cpu max' on amd64 only
9
10 It seems to break testing on 32-bit x86.
11
12 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
13
14 eclass/kernel-install.eclass | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17 diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
18 index 982cf7b08b4..20ad3555d23 100644
19 --- a/eclass/kernel-install.eclass
20 +++ b/eclass/kernel-install.eclass
21 @@ -228,10 +228,12 @@ kernel-install_test() {
22 "${T}/fs.qcow2" || die
23
24 cd "${T}" || die
25 + local qemu_extra_args=
26 + [[ ${qemu_arch} == x86_64 ]] && qemu_extra_args='-cpu max'
27 cat > run.sh <<-EOF || die
28 #!/bin/sh
29 exec qemu-system-${qemu_arch} \
30 - -cpu max \
31 + ${qemu_extra_args} \
32 -m 256M \
33 -display none \
34 -no-reboot \