SOURCES/0005-Add-support-for-Alibaba-cloud-on-aarch64.patch

@@ -1,4 +1,4 @@
-From 034981d94bf4ccac4159f013f2d4e2476a23d7e7 Mon Sep 17 00:00:00 2001
+From 04b504c47e0dc43c82b0d413a253d0599ce83321 Mon Sep 17 00:00:00 2001
 From: Yongkui Guo <yoguo@redhat.com>
 Date: Mon, 30 Jan 2023 18:20:32 +0800
 Subject: [PATCH] Add support for Alibaba cloud on aarch64

SOURCES/0006-Add-support-for-CRI-O-containers.patch

@@ -1,4 +1,4 @@
-From d163be00395030039fbdb09e0092667408705044 Mon Sep 17 00:00:00 2001
+From a0560c4b5f222a44b2f307fe8460c29f73e23e2f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 28 Jun 2023 10:00:42 +0100
 Subject: [PATCH] Add support for CRI-O containers
@@ -1514,7 +1514,7 @@ index 000000000..94c6daa24
 +    exit 1
 +fi
 diff --git a/virt-what.in b/virt-what.in
-index e310f339b..5c5b54b92 100644
+index fbf8c54c5..69f8c4bed 100644
 --- a/virt-what.in
 +++ b/virt-what.in
 @@ -198,6 +198,12 @@ if [ -e "${root}/proc/1/environ" ] &&

SOURCES/0006-nutanix-Don-t-match-Nutanix-based-baremetal-systems.patch

@@ -1,38 +0,0 @@
-From 5f10aff9e4b06fb07eb09411d58ee8c8209ff477 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Wed, 7 Jun 2023 10:10:03 +0100
-Subject: [PATCH] nutanix: Don't match Nutanix-based baremetal systems
-
-Nutanix ship baremetal systems which have modified firmware that
-reports similar to:
-
-  Manufacturer: Nutanix
-  Product Name: NX-T00-4NL3-G5
-
-This is not a virtual machine, but was recognised as such.  Make sure
-we match on 'Product Name: AHV' to identify only virtual machines.
-
-Thanks: Scott Yeager, Shaoyu Shang
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2211980
-(cherry picked from commit eeb7d8a1e7c73fc9c5b4e987d92a04136d61b07d)
----
- virt-what.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/virt-what.in b/virt-what.in
-index fbf8c54c5..e310f339b 100644
---- a/virt-what.in
-+++ b/virt-what.in
-@@ -259,7 +259,8 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then
- fi
- 
- # Check for Nutanix AHV.
--if echo "$dmi" | grep -q 'Manufacturer: Nutanix'; then
-+if echo "$dmi" | grep -q 'Manufacturer: Nutanix' &&
-+   echo "$dmi" | grep -q 'Product Name: AHV'; then
-     echo nutanix_ahv
- fi
- 
--- 
-2.39.1
-

SOURCES/copy-patches.sh

@@ -8,7 +8,7 @@ set -e
 #   ./copy-patches.sh
 
 project=virt-what
-rhel_version=9.3
+rhel_version=8.9
 
 # Check we're in the right directory.
 if [ ! -f $project.spec ]; then

SPECS/virt-what.spec

@@ -1,6 +1,6 @@
 Name:           virt-what
 Version:        1.25
-Release:        5%{?dist}
+Release:        4%{?dist}
 Summary:        Detect if we are running in a virtual machine
 License:        GPLv2+
 
@@ -11,7 +11,7 @@ Source0:        http://people.redhat.com/~rjones/virt-what/files/%{name}-%{versi
 Source1:       copy-patches.sh
 
 # Patches are maintained in the following repository:
-# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-9.3
+# http://git.annexia.org/?p=virt-what.git;a=shortlog;h=refs/heads/rhel-8.9
 
 # Patches.
 Patch0001:     0001-Rearrange-lxc-test-to-avoid-use-of-cat.patch
@@ -19,8 +19,7 @@ Patch0002:     0002-Move-docker-and-podman-tests-up-add-comments.patch
 Patch0003:     0003-podman-Fix-location-of-test-file-proc-1-environ.patch
 Patch0004:     0004-Detect-OCI-containers.patch
 Patch0005:     0005-Add-support-for-Alibaba-cloud-on-aarch64.patch
-Patch0006:     0006-nutanix-Don-t-match-Nutanix-based-baremetal-systems.patch
-Patch0007:     0007-Add-support-for-CRI-O-containers.patch
+Patch0006:     0006-Add-support-for-CRI-O-containers.patch
 
 BuildRequires:  make
 BuildRequires:  git
@@ -127,17 +126,13 @@ fi
 
 
 %changelog
-* Wed Jun 28 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-5
+* Wed Jun 28 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-4
 - Add support for CRI-O containers
-  resolves: rhbz#2218203
-
-* Thu Jun 08 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-4
-- Don't match Nutanix-based baremetal systems
-  resolves: rhbz#2211980
+  resolves: rhbz#2217407
 
 * Mon Jan 30 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-3
-- Add support for Alibaba Cloud on aarch64
-  resolves: rhbz#2165285
+- Add support for Alibaba cloud on aarch64
+  resolves: rhbz#2165518
 
 * Thu Jan 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.25-2
 - Add support for OCI containers
@@ -145,63 +140,44 @@ fi
 
 * Wed Aug 17 2022 Richard W.M. Jones <rjones@redhat.com> - 1.25-1
 - Rebase to 1.25
-  resolves: rhbz#2118997
-
-* Tue Aug 09 2022 Richard W.M. Jones <rjones@redhat.com> - 1.22-2
-- Detect KVM on GCE and AWS Arm instances
-  resolves: rhbz#2114997
+  resolves: rhbz#2118195
 
-* Thu Apr 14 2022 Richard W.M. Jones <rjones@redhat.com> - 1.22-1
-- New upstream version 1.22.
-  resolves: rhbz#2074476
-- Fix Source0 line.
+* Tue Apr 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.18-14
+- Add guest detection for RHEL hypervisors
+  resolves: rhbz#2076628
+- Update patches to 1.22
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.21-2.2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Mon Sep 06 2021 Richard W.M. Jones <rjones@redhat.com> - 1.18-13
+- Support for Docker
+  resolves: rhbz#2000834
 
-* Fri Jun 18 2021 Richard W.M. Jones <rjones@redhat.com> - 1.21-1.el9.2
+* Fri Jun 18 2021 Richard W.M. Jones <rjones@redhat.com> - 1.18-12
 - Support for VMware on aarch64
-  resolves: rhbz#1959174
-
-* Wed Jun  2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.21-1.el9.1
-- Add gating tests for RHEL 9
-
-* Mon Apr 19 2021 Richard W.M. Jones <rjones@redhat.com> - 1.21-1
-- New upstream version 1.21.
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.20-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.20-3
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+  resolves: rhbz#1959154
 
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Wed Jun 02 2021 Richard W.M. Jones <rjones@redhat.com> - 1.18-11
+- Add gating tests
+  resolves: rhbz#1967094
 
-* Thu Oct  3 2019 Richard W.M. Jones <rjones@redhat.com> - 1.20-1
-- New upstream version 1.20.
+* Wed Apr 28 2021 Richard W.M. Jones <rjones@redhat.com> - 1.18-10
+- Rebuild for fixed binutils on aarch64
+  resolves: rhbz#1954455
 
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Tue Apr 13 2021 Richard W.M. Jones <rjones@redhat.com> - 1.18-9
+- Fix crash on non-KVM platforms through incorrect use of CPUID
+  related: rhbz#1756381
 
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Tue Dec 10 2019 Richard W.M. Jones <rjones@redhat.com> - 1.18-8
+- Add support for Nutanix AHV
+  resolves: rhbz#1756381
+- Add all patches since 1.18 was released, up to 1.20 and beyond.
 
-* Wed Oct 31 2018 Richard W.M. Jones <rjones@redhat.com> - 1.19-1
-- New upstream version 1.19.
-- Fixes support for AWS.
-- Remove patches which are now upstream.
+* Thu Mar 21 2019 Richard W.M. Jones <rjones@redhat.com> - 1.18-7
+- Add gating tests resolves: rhbz#1682785
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Wed Oct 31 2018 Richard W.M. Jones <rjones@redhat.com> - 1.18-6
+- Add further patches to fix AWS support
+  resolves: rhbz#1644497
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild