New upstream version 1.18.

0001-Document-aws-meaning-Amazon-Web-Services-cloud-guest.patch

@@ -1,34 +0,0 @@
-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/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
-Content-Transfer-Encoding: 8bit
-
-Updates commit dc32228184622b28f412f527c0f353347db029b8.
----
- virt-what.pod | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/virt-what.pod b/virt-what.pod
-index 78e5655..ebfc190 100644
---- a/virt-what.pod
-+++ b/virt-what.pod
-@@ -25,6 +25,12 @@ don't know about or cannot detect.
- 
- =over 4
- 
-+=item B<aws>
-+
-+Amazon Web Services cloud guest.
-+
-+Status: contributed by Qi Guo.
-+
- =item B<bhyve>
- 
- This is a bhyve (FreeBSD hypervisor) guest.
--- 
-2.13.2
-

0002-tests-Fix-ldoms-test-so-it-doesn-t-test-the-host.patch

@@ -1,57 +0,0 @@
-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/3] tests: Fix ldoms test so it doesn't test the host.
-
-Fixes commit dc0c2972e178a6de9ee87501acca54447ea9c699.
----
- tests/ldoms/sbin/uname                  |  2 ++
- tests/ldoms/sbin/virt-what-cpuid-helper |  2 ++
- tests/test-ldoms.sh                     | 11 +----------
- 3 files changed, 5 insertions(+), 10 deletions(-)
- create mode 100755 tests/ldoms/sbin/uname
- create mode 100755 tests/ldoms/sbin/virt-what-cpuid-helper
-
-diff --git a/tests/ldoms/sbin/uname b/tests/ldoms/sbin/uname
-new file mode 100755
-index 0000000..9d07262
---- /dev/null
-+++ b/tests/ldoms/sbin/uname
-@@ -0,0 +1,2 @@
-+#!/bin/sh -
-+echo sparc64
-diff --git a/tests/ldoms/sbin/virt-what-cpuid-helper b/tests/ldoms/sbin/virt-what-cpuid-helper
-new file mode 100755
-index 0000000..42b1f97
---- /dev/null
-+++ b/tests/ldoms/sbin/virt-what-cpuid-helper
-@@ -0,0 +1,2 @@
-+#!/bin/sh -
-+echo 
-diff --git a/tests/test-ldoms.sh b/tests/test-ldoms.sh
-index 68c3c77..6ae5aba 100755
---- a/tests/test-ldoms.sh
-+++ b/tests/test-ldoms.sh
-@@ -17,18 +17,9 @@
- 
- root=tests/ldoms
- 
--# Include src dir in PATH
--export PATH=.:${PATH}
--
--arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
--
- output="$(./virt-what --test-root=$root 2>&1)"
--if [[ "${arch}" == sparc* ]]; then
--    expected="ldoms
-+expected="ldoms
- ldoms-guest"
--else
--    expected=""
--fi
- 
- if [ "$output" != "$expected" ]; then
-     echo "$0: test failed because output did not match expected"
--- 
-2.13.2
-

0003-ppc64-Test-root-proc-device-tree-hypervisor-instead-.patch

@@ -1,27 +0,0 @@
-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
-

sources

@@ -1 +1 @@
-SHA512 (virt-what-1.16.tar.gz) = 3f764d79cc677f45413be79df355c217777700c1e27a4a0fab5a055f2b22756f78acf000212d3cd7ec1c88d18f24b8ecc35eff966259dd813bd8768c14b89173
+SHA512 (virt-what-1.18.tar.gz) = 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613

virt-what.spec

@@ -1,5 +1,5 @@
 Name:           virt-what
-Version:        1.16
+Version:        1.18
 Release:        1%{?dist}
 Summary:        Detect if we are running in a virtual machine
 License:        GPLv2+
@@ -7,13 +7,6 @@ License:        GPLv2+
 URL:            http://people.redhat.com/~rjones/virt-what/
 Source0:        http://people.redhat.com/~rjones/virt-what/files/%{name}-%{version}.tar.gz
 
-# Upstream patch which completes support for AWS.
-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.
 BuildRequires:  /usr/bin/pod2man
@@ -83,12 +76,6 @@ Current types of virtualization detected:
 
 %prep
 %setup -q
-%patch0001 -p1
-%patch0002 -p1
-# 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
@@ -114,13 +101,10 @@ fi
 
 
 %changelog
-* Mon Jul 31 2017 Richard W.M. Jones <rjones@redhat.com> - 1.16-1
+* Mon Jul 31 2017 Richard W.M. Jones <rjones@redhat.com> - 1.18-1
-- New upstream version 1.16.
+- New upstream version 1.18.
-- Add upstream patch which completes support for AWS.
 - 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