From 61f0dc07eed83a3ae885dda5df7056b623d61407 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Tue, 27 Sep 2022 16:51:09 +0000
Subject: [PATCH] import virtio-win-1.9.28-0.el9_0
---
.gitignore | 16 ++--
.virtio-win.metadata | 22 ++---
SOURCES/agents.json | 4 +-
...tio-win-pre-installable-drivers-win-10.xml | 20 ++++
...tio-win-pre-installable-drivers-win-11.xml | 96 +++++++++++++++++++
SPECS/virtio-win.spec | 57 +++++++----
6 files changed, 173 insertions(+), 42 deletions(-)
create mode 100644 SOURCES/virtio-win-pre-installable-drivers-win-11.xml
diff --git a/.gitignore b/.gitignore
index 00423a5..8c6e64f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,14 @@
-SOURCES/mingw-qemu-ga-win-101.2.0-1.el7ev.src.rpm
-SOURCES/ovirt-guest-agent-x64.msi
-SOURCES/ovirt-guest-agent-x86.msi
-SOURCES/qemu-ga-win-101.2.0-1.el7ev.noarch.rpm
+SOURCES/mingw-qemu-ga-win-104.0.2-1.el9.src.rpm
+SOURCES/qemu-ga-win-104.0.2-1.el9.noarch.rpm
SOURCES/qxl-win-unsigned-0.1-24-sources.zip
-SOURCES/spice-qxl-wddm-dod-0.20-1.el8.noarch.rpm
-SOURCES/spice-qxl-wddm-dod-0.20-1.el8.src.rpm
+SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm
+SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm
SOURCES/spice-vdagent-win-0.10.0-5.el8.src.rpm
SOURCES/spice-vdagent-win-x64-0.10.0-5.el8.noarch.rpm
SOURCES/spice-vdagent-win-x86-0.10.0-5.el8.noarch.rpm
-SOURCES/virtio-win-1.9.15-bin-for-rpm.tar.gz
+SOURCES/virtio-win-1.9.28-bin-for-rpm.tar.gz
SOURCES/virtio-win-gt-x64.msi
SOURCES/virtio-win-gt-x86.msi
SOURCES/virtio-win-guest-tools.exe
-SOURCES/virtio-win-installer-1.9.15-1-sources.zip
-SOURCES/virtio-win-prewhql-0.1-191-sources.zip
+SOURCES/virtio-win-installer-1.9.28-0-sources.zip
+SOURCES/virtio-win-prewhql-0.1-221-sources.zip
diff --git a/.virtio-win.metadata b/.virtio-win.metadata
index 8e5730b..f1678b2 100644
--- a/.virtio-win.metadata
+++ b/.virtio-win.metadata
@@ -1,16 +1,14 @@
-bc42f2bbe07f9c0875b548412e0b442f1013018f SOURCES/mingw-qemu-ga-win-101.2.0-1.el7ev.src.rpm
-f4320191d4e90ecd4cc9501b3fbdffc950a459c1 SOURCES/ovirt-guest-agent-x64.msi
-0c9ed8ccf9309cfce3763081112cb409ab24c92f SOURCES/ovirt-guest-agent-x86.msi
-88a74863da6e7e7e887a668476409002f8838cfe SOURCES/qemu-ga-win-101.2.0-1.el7ev.noarch.rpm
+60ece31ee2de0fe6fe16098616aca96b06da126e SOURCES/mingw-qemu-ga-win-104.0.2-1.el9.src.rpm
+ba9ab071d3cc39ff777a2730014cd95df2f64397 SOURCES/qemu-ga-win-104.0.2-1.el9.noarch.rpm
1cb09750a3a1965a147889f5db3ec7b8feb005b8 SOURCES/qxl-win-unsigned-0.1-24-sources.zip
-1f8c348bfb8d3336cb265c947ecfa8d48275c48c SOURCES/spice-qxl-wddm-dod-0.20-1.el8.noarch.rpm
-8b625071662bf77b23100650665288e720717434 SOURCES/spice-qxl-wddm-dod-0.20-1.el8.src.rpm
+95dab7088166ba71366bcbcb099267d771d61661 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm
+055c8fe47a378ef48b89846ba9c2474238ad9aea SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm
085728c7db3503db1f7c8f1d264ca45b365d6837 SOURCES/spice-vdagent-win-0.10.0-5.el8.src.rpm
fb35d3c12b9069133e651f54c35ae6ee68537959 SOURCES/spice-vdagent-win-x64-0.10.0-5.el8.noarch.rpm
2d4bd6f8fb1b306f4d49a5a990e2da9c5f5baeac SOURCES/spice-vdagent-win-x86-0.10.0-5.el8.noarch.rpm
-374dc04dceb2799e39e68dcb2c8963a715b73a67 SOURCES/virtio-win-1.9.15-bin-for-rpm.tar.gz
-a921e77995f6cd12534dfb6de0f8e6ccb50771fc SOURCES/virtio-win-gt-x64.msi
-3d1da4dae7d4e7f6ef397470e1ac1f720ddbf7c1 SOURCES/virtio-win-gt-x86.msi
-ec4d5e4a99882f5773c35d5395faacfb6ef135e9 SOURCES/virtio-win-guest-tools.exe
-a13530c19562f9f20bde10bec21ec693bf75eb1b SOURCES/virtio-win-installer-1.9.15-1-sources.zip
-7f80af9cdcae2c75314a6eb3063170aeba92715d SOURCES/virtio-win-prewhql-0.1-191-sources.zip
+2771f95632887c40967ebaefd04d27af0905e6b7 SOURCES/virtio-win-1.9.28-bin-for-rpm.tar.gz
+81f56399304c04a291fc94bb7898a8d999cc36c3 SOURCES/virtio-win-gt-x64.msi
+56af7d695ba5b613dc6079b139ac851ff946402f SOURCES/virtio-win-gt-x86.msi
+c44ffa23e6bbdf10274a6017f692215b8f7689bf SOURCES/virtio-win-guest-tools.exe
+9c1c0f24b8427b5c5847092834bec43fa60898a8 SOURCES/virtio-win-installer-1.9.28-0-sources.zip
+5b3c6e13c9f8847a5d8964d8e1d9154ecafcea2b SOURCES/virtio-win-prewhql-0.1-221-sources.zip
diff --git a/SOURCES/agents.json b/SOURCES/agents.json
index 3727eab..55b469f 100644
--- a/SOURCES/agents.json
+++ b/SOURCES/agents.json
@@ -2,12 +2,12 @@
"agents": [
{
"arch": "x86",
- "agent_version": "101.2.0-1",
+ "agent_version": "104.0.2-1",
"name": "Red Hat QEMU guest agent"
},
{
"arch": "amd64",
- "agent_version": "101.2.0-1",
+ "agent_version": "104.0.2-1",
"name": "Red Hat QEMU guest agent"
},
{
diff --git a/SOURCES/virtio-win-pre-installable-drivers-win-10.xml b/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
index 3773ef4..083e3e8 100644
--- a/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-10.xml
@@ -86,6 +86,16 @@
<file>viofs.inf</file>
<file>viofs.sys</file>
<device id="http://pcisig.com/pci/1af4/105a"/>
+
+ <file>qxldod.cat</file>
+ <file>qxldod.inf</file>
+ <file>qxldod.sys</file>
+ <device id="http://pcisig.com/pci/1b36/0100"/>
+
+ <file>viogpudo.cat</file>
+ <file>viogpudo.inf</file>
+ <file>viogpudo.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
</driver>
<driver signed="true" pre-installable="true" location="file:///usr/share/virtio-win/drivers/by-os/amd64/w10/" arch="x86_64">
@@ -148,6 +158,16 @@
<file>viofs.inf</file>
<file>viofs.sys</file>
<device id="http://pcisig.com/pci/1af4/105a"/>
+
+ <file>qxldod.cat</file>
+ <file>qxldod.inf</file>
+ <file>qxldod.sys</file>
+ <device id="http://pcisig.com/pci/1b36/0100"/>
+
+ <file>viogpudo.cat</file>
+ <file>viogpudo.inf</file>
+ <file>viogpudo.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
</driver>
</os>
</libosinfo>
diff --git a/SOURCES/virtio-win-pre-installable-drivers-win-11.xml b/SOURCES/virtio-win-pre-installable-drivers-win-11.xml
new file mode 100644
index 0000000..766758f
--- /dev/null
+++ b/SOURCES/virtio-win-pre-installable-drivers-win-11.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+
+ <os id="http://microsoft.com/win/11">
+ <short-id>win11</short-id>
+ <name>Microsoft Windows 11</name>
+ <name xml:lang="ca">Microsoft Windows 11</name>
+ <name xml:lang="es">Microsoft Windows 11</name>
+ <name xml:lang="fr">Microsoft Windows 11</name>
+ <name xml:lang="id">Microsoft Windows 11</name>
+ <name xml:lang="it">Microsoft Windows 11</name>
+ <name xml:lang="pl">Microsoft Windows 11</name>
+ <name xml:lang="tr">Microsoft Windows 11</name>
+ <name xml:lang="uk">Microsoft Windows 11</name>
+ <vendor>Microsoft Corporation</vendor>
+ <vendor xml:lang="ca">Microsoft Corporation</vendor>
+ <vendor xml:lang="de">Microsoft Corporation</vendor>
+ <vendor xml:lang="es">Microsoft Corporation</vendor>
+ <vendor xml:lang="fr">Microsoft Corporation</vendor>
+ <vendor xml:lang="id">Microsoft Corporation</vendor>
+ <vendor xml:lang="it">Microsoft Corporation</vendor>
+ <vendor xml:lang="ja">Microsoft Corporation</vendor>
+ <vendor xml:lang="pl">Microsoft Corporation</vendor>
+ <vendor xml:lang="pt_BR">Microsoft Corporation</vendor>
+ <vendor xml:lang="tr">Microsoft Corporation</vendor>
+ <vendor xml:lang="uk">ÐšÐ¾Ñ€Ð¿Ð¾Ñ€Ð°Ñ†Ñ–Ñ Microsoft</vendor>
+
+
+ <driver signed="true" pre-installable="true" location="file:///usr/share/virtio-win/drivers/by-os/amd64/w11/" arch="x86_64">
+ <file>balloon.cat</file>
+ <file>balloon.inf</file>
+ <file>balloon.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1002"/>
+ <device id="http://pcisig.com/pci/1af4/1045"/>
+
+ <file>netkvm.cat</file>
+ <file>netkvm.inf</file>
+ <file>netkvm.sys</file>
+ <file>netkvmco.dll</file>
+ <device id="http://pcisig.com/pci/1af4/1000"/>
+ <device id="http://pcisig.com/pci/1af4/1041"/>
+
+ <file>pvpanic.cat</file>
+ <file>pvpanic.inf</file>
+ <file>pvpanic.sys</file>
+
+ <file>qemufwcfg.cat</file>
+ <file>qemufwcfg.inf</file>
+
+ <file>qemupciserial.cat</file>
+ <file>qemupciserial.inf</file>
+
+ <file>viohidkmdf.sys</file>
+ <file>vioinput.cat</file>
+ <file>vioinput.inf</file>
+ <file>vioinput.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1052"/>
+
+ <file>viorng.cat</file>
+ <file>viorng.inf</file>
+ <file>viorng.sys</file>
+ <file>viorngci.dll</file>
+ <file>viorngum.dll</file>
+ <device id="http://pcisig.com/pci/1af4/1005"/>
+ <device id="http://pcisig.com/pci/1af4/1044"/>
+
+ <file>vioscsi.cat</file>
+ <file>vioscsi.inf</file>
+ <file>vioscsi.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1004"/>
+ <device id="http://pcisig.com/pci/1af4/1048"/>
+
+ <file>vioser.cat</file>
+ <file>vioser.inf</file>
+ <file>vioser.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1003"/>
+ <device id="http://pcisig.com/pci/1af4/1043"/>
+
+ <file>viostor.cat</file>
+ <file>viostor.inf</file>
+ <file>viostor.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1001"/>
+ <device id="http://pcisig.com/pci/1af4/1042"/>
+
+ <file>viofs.cat</file>
+ <file>viofs.inf</file>
+ <file>viofs.sys</file>
+ <device id="http://pcisig.com/pci/1af4/105a"/>
+
+ <file>viogpudo.cat</file>
+ <file>viogpudo.inf</file>
+ <file>viogpudo.sys</file>
+ <device id="http://pcisig.com/pci/1af4/1050"/>
+ </driver>
+ </os>
+</libosinfo>
diff --git a/SPECS/virtio-win.spec b/SPECS/virtio-win.spec
index bf9063f..a17685c 100644
--- a/SPECS/virtio-win.spec
+++ b/SPECS/virtio-win.spec
@@ -8,18 +8,18 @@
# If you make any changes to this file that affect the RPM content (but not
# version numbers or changelogs, etc), submit a patch to the upstream spec.
-%global virtio_win_prewhql_build virtio-win-prewhql-0.1-191
-%global qemu_ga_win_build qemu-ga-win-101.2.0-1.el7ev
+%global virtio_win_prewhql_build virtio-win-prewhql-0.1-221
+%global qemu_ga_win_build qemu-ga-win-104.0.2-1.el9
%global qxl_build qxl-win-unsigned-0.1-24
%global spice_vdagent_build 0.10.0-5.el8
-%global qxlwddm_build spice-qxl-wddm-dod-0.20-1.el8
+%global qxlwddm_build spice-qxl-wddm-dod-0.21-2.el8
-%global windows_installer_version -1.9.15-1
+%global windows_installer_version -1.9.28-0
Summary: VirtIO para-virtualized drivers for Windows(R)
Name: virtio-win
-Version: 1.9.15
-Release: 4%{?dist}
+Version: 1.9.28
+Release: 0%{?dist}
Group: Applications/System
URL: http://www.redhat.com/
BuildArch: noarch
@@ -27,9 +27,9 @@ BuildArch: noarch
%if 0%{?rhel}
# RHEL RPM ships WHQL signed drivers, which are under a proprietary license
# qemu-ga builds are GPLv2
-License: Red Hat Proprietary and GPLv2
+License: BSD-3-Clause and Apache-2.0 and GPLv2
%else
-# virtio-win drivers are licensed under the BSD license, qxldod under Apache,
+# virtio-win drivers are licensed under the BSD license, qxldod under Apache-2.0,
# everything else is GPLv2
# virtio-win: https://github.com/virtio-win/kvm-guest-drivers-windows/blob/master/LICENSE
# qxl: http://cgit.freedesktop.org/spice/win32/qxl/tree/xddm/COPYING
@@ -59,8 +59,6 @@ Source22: virtio-win-gt-x64.msi
Source23: virtio-win-guest-tools-installer-%{version}.tar.gz
%else
Source23: virtio-win-installer%{windows_installer_version}-sources.zip
-Source24: ovirt-guest-agent-x64.msi
-Source25: ovirt-guest-agent-x86.msi
%endif
%if 0%{?rhel}
@@ -68,6 +66,7 @@ Source70: virtio-win-pre-installable-drivers-win-7.xml
Source71: virtio-win-pre-installable-drivers-win-8.xml
Source72: virtio-win-pre-installable-drivers-win-8.1.xml
Source73: virtio-win-pre-installable-drivers-win-10.xml
+Source74: virtio-win-pre-installable-drivers-win-11.xml
Source80: agents.json
%endif
@@ -118,11 +117,6 @@ popd
%{__cp} %{SOURCE21} iso-content/
%{__cp} %{SOURCE22} iso-content/
-%if 0%{?rhel}
-%{__cp} %{SOURCE24} iso-content/
-%{__cp} %{SOURCE25} iso-content/
-%endif
-
%if 0%{?rhel} > 7
# Dropping unsupported Windows versions.
@@ -154,6 +148,8 @@ pushd iso-content
-o ../media/%{name}-%{version}.iso \
-r -iso-level 4 \
-input-charset iso8859-1 \
+ -allow-lowercase \
+ -relaxed-filenames \
-V "%{name}-%{version}" .
popd
@@ -190,6 +186,9 @@ add_link _servers_amd64.vfd
%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-10.d/
%{__cp} %{SOURCE73} %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-10.d/
+
+%{__mkdir} -p %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-11.d/
+%{__cp} %{SOURCE74} %{buildroot}/%{_datadir}/osinfo/os/microsoft.com/win-11.d/
%endif
%{__cp} -a rpm-drivers %{buildroot}/%{_datadir}/%{name}/drivers
@@ -217,8 +216,6 @@ add_link _servers_amd64.vfd
%{__install} -p -m0644 iso-content/virtio-win-guest-tools.exe %{buildroot}%{_datadir}/%{name}/installer/
%{__install} -p -m0644 iso-content/virtio-win-gt-x86.msi %{buildroot}%{_datadir}/%{name}/installer/
%{__install} -p -m0644 iso-content/virtio-win-gt-x64.msi %{buildroot}%{_datadir}/%{name}/installer/
-%{__install} -p -m0644 iso-content/ovirt-guest-agent-x64.msi %{buildroot}%{_datadir}/%{name}/installer/
-%{__install} -p -m0644 iso-content/ovirt-guest-agent-x86.msi %{buildroot}%{_datadir}/%{name}/installer/
%files
@@ -248,9 +245,10 @@ add_link _servers_amd64.vfd
%{_datadir}/%{name}/drivers/by-driver/viostor
%{_datadir}/%{name}/drivers/by-driver/viofs
%{_datadir}/%{name}/drivers/by-driver/sriov
+%{_datadir}/%{name}/drivers/by-driver/qxldod
+%{_datadir}/%{name}/drivers/by-driver/viogpudo
%exclude %{_datadir}/%{name}/drivers/by-driver/virtio-win_license.txt
%if 0%{?fedora}
-%{_datadir}/%{name}/drivers/by-driver/qxldod
%{_datadir}/%{name}/drivers/by-driver/smbus
%endif
@@ -273,6 +271,7 @@ add_link _servers_amd64.vfd
%{_datadir}/osinfo/os/microsoft.com/win-8.d/virtio-win-pre-installable-drivers-win-8.xml
%{_datadir}/osinfo/os/microsoft.com/win-8.1.d/virtio-win-pre-installable-drivers-win-8.1.xml
%{_datadir}/osinfo/os/microsoft.com/win-10.d/virtio-win-pre-installable-drivers-win-10.xml
+%{_datadir}/osinfo/os/microsoft.com/win-11.d/virtio-win-pre-installable-drivers-win-11.xml
%endif
# .json files
@@ -281,6 +280,26 @@ add_link _servers_amd64.vfd
%endif
%changelog
+* Sat Jul 23 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.28-0.el9
+- Resolves: rhbz#2082607
+
+* Fri Jun 09 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.27-0.el9
+- Resolves: rhbz#2082607
+
+* Thu Jun 09 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.26-1.el9
+- Resolves: rhbz#2082607
+
+* Thu Apr 07 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.25-2.el9_0
+- Resolves: rhbz#2044343
+
+* Sun Apr 03 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.25-1.el9
+- Update installer to 1.0.20.2
+- Resolves: rhbz#2044343
+
+* Tue Jan 15 2022 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.24-3.el9
+- Update installer to 1.0.19.11
+- Resolves: rhbz#2044343
+
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
@@ -288,7 +307,7 @@ add_link _servers_amd64.vfd
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-* Wen Jan 20 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.15-2.el9
+* Wed Jan 20 2021 Vadim Rozenfeld <vrozenfe@redhat.com> - 1.9.15-2.el9
- This is a plain copy of the virtio-win package released in RHEL-8.3.1 for RHEL-9.0.0
- Resolves: rhbz#1916284
--
GitLab