From d69c7e58fd4afcc79625bcf9e879ef0a2902b9d1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 07 2021 18:33:18 +0000 Subject: import virtio-win-1.9.15-4.el9 --- diff --git a/.gitignore b/.gitignore index 4165b6c..00423a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,16 @@ -SOURCES/mingw-qemu-ga-win-102.7.0-0.el8.src.rpm -SOURCES/qemu-ga-win-102.7.0-0.el8.noarch.rpm +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/qxl-win-unsigned-0.1-24-sources.zip -SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm -SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm +SOURCES/spice-qxl-wddm-dod-0.20-1.el8.noarch.rpm +SOURCES/spice-qxl-wddm-dod-0.20-1.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.19-bin-for-rpm.tar.gz +SOURCES/virtio-win-1.9.15-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.18-3-sources.zip -SOURCES/virtio-win-prewhql-0.1-208-sources.zip +SOURCES/virtio-win-installer-1.9.15-1-sources.zip +SOURCES/virtio-win-prewhql-0.1-191-sources.zip diff --git a/.virtio-win.metadata b/.virtio-win.metadata index d1a8db8..8e5730b 100644 --- a/.virtio-win.metadata +++ b/.virtio-win.metadata @@ -1,14 +1,16 @@ -b6f9fe272b31e82d96b655cab6e7ff71ac90eaee SOURCES/mingw-qemu-ga-win-102.7.0-0.el8.src.rpm -7790b1263dcfce8dc7237d8f60e278f6b008e9a5 SOURCES/qemu-ga-win-102.7.0-0.el8.noarch.rpm +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 1cb09750a3a1965a147889f5db3ec7b8feb005b8 SOURCES/qxl-win-unsigned-0.1-24-sources.zip -95dab7088166ba71366bcbcb099267d771d61661 SOURCES/spice-qxl-wddm-dod-0.21-2.el8.noarch.rpm -055c8fe47a378ef48b89846ba9c2474238ad9aea SOURCES/spice-qxl-wddm-dod-0.21-2.el8.src.rpm +1f8c348bfb8d3336cb265c947ecfa8d48275c48c SOURCES/spice-qxl-wddm-dod-0.20-1.el8.noarch.rpm +8b625071662bf77b23100650665288e720717434 SOURCES/spice-qxl-wddm-dod-0.20-1.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 -1f66eabda48adeee61841564df53f707432eb086 SOURCES/virtio-win-1.9.19-bin-for-rpm.tar.gz -9f9968d2ea32ceadf8732af3a343da3a11729218 SOURCES/virtio-win-gt-x64.msi -48b7c4d302c1ab78421da47431a7b0bdf3c14a88 SOURCES/virtio-win-gt-x86.msi -0ef087f6edee2415ea9b063181a115ad837e2f1f SOURCES/virtio-win-guest-tools.exe -b006f7fdaa9e3586619478453ce7a20b2dab6b5c SOURCES/virtio-win-installer-1.9.18-3-sources.zip -20fc86cd30879eba041a10d10db9c97ac30e3e4f SOURCES/virtio-win-prewhql-0.1-208-sources.zip +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 diff --git a/SOURCES/agents.json b/SOURCES/agents.json index 07b17be..3727eab 100644 --- a/SOURCES/agents.json +++ b/SOURCES/agents.json @@ -2,12 +2,12 @@ "agents": [ { "arch": "x86", - "agent_version": "102.7.0-0", + "agent_version": "101.2.0-1", "name": "Red Hat QEMU guest agent" }, { "arch": "amd64", - "agent_version": "102.7.0-0", + "agent_version": "101.2.0-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 083e3e8..3773ef4 100644 --- a/SOURCES/virtio-win-pre-installable-drivers-win-10.xml +++ b/SOURCES/virtio-win-pre-installable-drivers-win-10.xml @@ -86,16 +86,6 @@ viofs.inf viofs.sys - - qxldod.cat - qxldod.inf - qxldod.sys - - - viogpudo.cat - viogpudo.inf - viogpudo.sys - @@ -158,16 +148,6 @@ viofs.inf viofs.sys - - qxldod.cat - qxldod.inf - qxldod.sys - - - viogpudo.cat - viogpudo.inf - viogpudo.sys - diff --git a/SPECS/virtio-win.spec b/SPECS/virtio-win.spec index ee57df7..bf9063f 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-208 -%global qemu_ga_win_build qemu-ga-win-102.7.0-0.el8 +%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 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.21-2.el8 +%global qxlwddm_build spice-qxl-wddm-dod-0.20-1.el8 -%global windows_installer_version -1.9.18-3 +%global windows_installer_version -1.9.15-1 Summary: VirtIO para-virtualized drivers for Windows(R) Name: virtio-win -Version: 1.9.19 -Release: 3%{?dist} +Version: 1.9.15 +Release: 4%{?dist} Group: Applications/System URL: http://www.redhat.com/ BuildArch: noarch @@ -27,7 +27,7 @@ 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 BSD-3-Clause and Apache and GPLv2 +License: Red Hat Proprietary and GPLv2 %else # virtio-win drivers are licensed under the BSD license, qxldod under Apache, # everything else is GPLv2 @@ -59,6 +59,8 @@ 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} @@ -116,6 +118,11 @@ 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. @@ -147,7 +154,6 @@ pushd iso-content -o ../media/%{name}-%{version}.iso \ -r -iso-level 4 \ -input-charset iso8859-1 \ - -allow-lowercase \ -V "%{name}-%{version}" . popd @@ -211,6 +217,8 @@ 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 @@ -240,10 +248,9 @@ 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 @@ -274,13 +281,6 @@ add_link _servers_amd64.vfd %endif %changelog -* Thu Sep 30 2021 Vadim Rozenfeld - 1.9.19-3.el9 -- Resolves: rhbz#1951865 - -* Fri Sep 24 2021 Vadim Rozenfeld - 1.9.19-2.el9 -- This is a plain copy of the virtio-win package released in RHEL-8.5.0 for RHEL-9.0.0-beta -- Resolves: rhbz#1951865 - * Tue Aug 10 2021 Mohan Boddu - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 @@ -288,7 +288,7 @@ add_link _servers_amd64.vfd * Fri Apr 16 2021 Mohan Boddu - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 -* Wed Jan 20 2021 Vadim Rozenfeld - 1.9.15-2.el9 +* Wen Jan 20 2021 Vadim Rozenfeld - 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