Add upstream patch which fixes tests on POWER KVM.
This commit is contained in:
parent
2ab9ebc968
commit
26f82197c8
@ -1,7 +1,7 @@
|
||||
From d37de7dd898538137998a28bda2a6d1e63e747b8 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 31 Jul 2017 14:32:51 +0100
|
||||
Subject: [PATCH 1/2] =?UTF-8?q?Document=20=E2=80=98aws=E2=80=99=20meaning?=
|
||||
Subject: [PATCH 1/3] =?UTF-8?q?Document=20=E2=80=98aws=E2=80=99=20meaning?=
|
||||
=?UTF-8?q?=20Amazon=20Web=20Services=20cloud=20guest.?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 0e25bd8297ddedec14a260b25a6347ccca784df3 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 31 Jul 2017 15:04:28 +0100
|
||||
Subject: [PATCH 2/2] tests: Fix ldoms test so it doesn't test the host.
|
||||
Subject: [PATCH 2/3] tests: Fix ldoms test so it doesn't test the host.
|
||||
|
||||
Fixes commit dc0c2972e178a6de9ee87501acca54447ea9c699.
|
||||
---
|
||||
|
@ -0,0 +1,27 @@
|
||||
From 39ca395b05519ffbfc7b8971a7bd647a9c68c8b1 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 31 Jul 2017 15:19:52 +0100
|
||||
Subject: [PATCH 3/3] ppc64: Test ${root}/proc/device-tree/hypervisor instead
|
||||
of real file.
|
||||
|
||||
Fixes commit 50153230d19401fe47fcfd19d7ca0a2623c1ff09.
|
||||
---
|
||||
virt-what.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/virt-what.in b/virt-what.in
|
||||
index f525a89..8c27b11 100644
|
||||
--- a/virt-what.in
|
||||
+++ b/virt-what.in
|
||||
@@ -298,7 +298,7 @@ if ! "$skip_qemu_kvm"; then
|
||||
echo qemu
|
||||
skip_lkvm=true
|
||||
fi
|
||||
- elif [ -d /proc/device-tree/hypervisor ] &&
|
||||
+ elif [ -d ${root}/proc/device-tree/hypervisor ] &&
|
||||
grep -q "linux,kvm" /proc/device-tree/hypervisor/compatible; then
|
||||
# We are running as a spapr KVM guest on ppc64
|
||||
echo kvm
|
||||
--
|
||||
2.13.2
|
||||
|
@ -11,6 +11,8 @@ Source0: http://people.redhat.com/~rjones/virt-what/files/%{name}-%{versi
|
||||
Patch0001: 0001-Document-aws-meaning-Amazon-Web-Services-cloud-guest.patch
|
||||
# Upstream patch which fixes ldoms test.
|
||||
Patch0002: 0002-tests-Fix-ldoms-test-so-it-doesn-t-test-the-host.patch
|
||||
# Upstream patch which fixes tests on POWER KVM.
|
||||
Patch0003: 0003-ppc64-Test-root-proc-device-tree-hypervisor-instead-.patch
|
||||
|
||||
# This is provided by the build root, but we make it explicit
|
||||
# anyway in case this was dropped from the build root in future.
|
||||
@ -86,6 +88,7 @@ Current types of virtualization detected:
|
||||
# Need to fix +x permissions on new files in patch0002...
|
||||
chmod +x tests/ldoms/sbin/uname
|
||||
chmod +x tests/ldoms/sbin/virt-what-cpuid-helper
|
||||
%patch0003 -p1
|
||||
|
||||
|
||||
%build
|
||||
@ -117,6 +120,7 @@ fi
|
||||
- Update RPM description section with complete list of supported guests.
|
||||
- If ‘make check’ fails, dump ‘test-suite.log’.
|
||||
- Add upstream patch which fixes ldoms test.
|
||||
- Add upstream patch which fixes tests on POWER KVM.
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user