diff --git a/.gitignore b/.gitignore index 68c989d..e0718e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ -SOURCES/mingw-qemu-ga-win-100.0.0.0-3.el7ev.src.rpm -SOURCES/qemu-ga-win-100.0.0.0-3.el7ev.noarch.rpm +SOURCES/mingw-qemu-ga-win-101.1.0-1.el7ev.src.rpm +SOURCES/qemu-ga-win-101.1.0-1.el7ev.noarch.rpm SOURCES/qxl-win-unsigned-0.1-24-sources.zip -SOURCES/virtio-win-1.9.9-bin-for-rpm.tar.gz -SOURCES/virtio-win-prewhql-0.1-172-sources.zip +SOURCES/virtio-win-1.9.11-bin-for-rpm.tar.gz +SOURCES/virtio-win-gt-x64-1.9.11-1.msi +SOURCES/virtio-win-gt-x86-1.9.11-1.msi +SOURCES/virtio-win-installer-1.9.11-1-sources.zip +SOURCES/virtio-win-prewhql-0.1-180-sources.zip diff --git a/.virtio-win.metadata b/.virtio-win.metadata index d778158..ce8e53f 100644 --- a/.virtio-win.metadata +++ b/.virtio-win.metadata @@ -1,5 +1,8 @@ -77654f47032f6a314566437ba35cc5ed7534ac9a SOURCES/mingw-qemu-ga-win-100.0.0.0-3.el7ev.src.rpm -ed2ad0d807b65012dbf792f55b7a5b9ffaa0e96a SOURCES/qemu-ga-win-100.0.0.0-3.el7ev.noarch.rpm +10d2d5459bce3ebee30943bcfc43d223ab905c2a SOURCES/mingw-qemu-ga-win-101.1.0-1.el7ev.src.rpm +5365fe4430a33ae794c1e1d087add592cc3e7f6a SOURCES/qemu-ga-win-101.1.0-1.el7ev.noarch.rpm 1cb09750a3a1965a147889f5db3ec7b8feb005b8 SOURCES/qxl-win-unsigned-0.1-24-sources.zip -4dac37923c14710c0942c879076058b3730ae78c SOURCES/virtio-win-1.9.9-bin-for-rpm.tar.gz -3add5edcccbef9ce19afbf0a3859f4ae04dde633 SOURCES/virtio-win-prewhql-0.1-172-sources.zip +2b5ef7cdb250e70cd1fa4bc4236efefc1313a70e SOURCES/virtio-win-1.9.11-bin-for-rpm.tar.gz +a0658ab7744c4c64cae10d4ef156b9602b522b35 SOURCES/virtio-win-gt-x64-1.9.11-1.msi +ab68896a8824a5f8f466f0cb2d2c3c6e56b6ea24 SOURCES/virtio-win-gt-x86-1.9.11-1.msi +f6f5c747b07c4f1aec2cfbf25032a8265a441c3b SOURCES/virtio-win-installer-1.9.11-1-sources.zip +2675635f24eb984e48e8eae9ab11a953c7fee334 SOURCES/virtio-win-prewhql-0.1-180-sources.zip diff --git a/SPECS/virtio-win.spec b/SPECS/virtio-win.spec index 0e52f1a..d661095 100644 --- a/SPECS/virtio-win.spec +++ b/SPECS/virtio-win.spec @@ -6,21 +6,22 @@ # https://github.com/crobinso/virtio-win-pkg-scripts # # If you make any changes to this file that affect the RPM content (but not -# version numbers or changelogs, etc), submit a patch them to the upstream -# spec file. +# version numbers or changelogs, etc), submit a patch to the upstream spec. -%global virtio_win_prewhql_build virtio-win-prewhql-0.1-172 -%global qemu_ga_win_build qemu-ga-win-100.0.0.0-3.el7ev +%global virtio_win_prewhql_build virtio-win-prewhql-0.1-180 +%global qemu_ga_win_build qemu-ga-win-101.1.0-1.el7ev %global qxl_build qxl-win-unsigned-0.1-24 # qxlwddm is fedora only for now %if 0%{?fedora} %global qxlwddm_build spice-qxl-wddm-dod-0.18-0 %endif +%global windows_installer_version -1.9.11-1 + Summary: VirtIO para-virtualized drivers for Windows(R) Name: virtio-win -Version: 1.9.9 -Release: 3%{?dist} +Version: 1.9.11 +Release: 1%{?dist} Group: Applications/System URL: http://www.redhat.com/ BuildArch: noarch @@ -45,6 +46,14 @@ Source5: %{qxl_build}-sources.zip Source6: %{qxlwddm_build}-sources.zip %endif +Source21: virtio-win-gt-x86%{windows_installer_version}.msi +Source22: virtio-win-gt-x64%{windows_installer_version}.msi +%if 0%{?fedora} +Source23: virtio-win-guest-tools-installer-%{version}.tar.gz +%else +Source23: virtio-win-installer%{windows_installer_version}-sources.zip +%endif + BuildRequires: /usr/bin/mkisofs @@ -57,6 +66,7 @@ Windows(R) guests. %prep %setup -q -T -b 1 -n %{name}-%{version} +# Extract qemu-ga RPM mkdir -p guest-agent mkdir -p %{qemu_ga_win_build} pushd %{qemu_ga_win_build}/ && rpm2cpio %{SOURCE2} | cpio -idmv @@ -65,6 +75,12 @@ popd %{__mv} %{qemu_ga_win_build}/usr/i686-w64-mingw32/sys-root/mingw/bin/qemu-ga-i386.msi guest-agent/ %{__mv} %{qemu_ga_win_build}/usr/x86_64-w64-mingw32/sys-root/mingw/bin/qemu-ga-x86_64.msi guest-agent/ + +# Move virtio-win MSIs into place +%{__cp} %{SOURCE21} ./virtio-win-gt-x86.msi +%{__cp} %{SOURCE22} ./virtio-win-gt-x64.msi + + %if 0%{?rhel} > 7 # Dropping unsupported Windows versions. # It's done here to fix two issues at the same time: do not @@ -75,11 +91,19 @@ popd %{__rm} smbus -rf %endif -%build + +%build # Generate .iso -/usr/bin/mkisofs -m 'virtio-win*.vfd' -m vfddrivers -m %{qemu_ga_win_build} -o %{name}-%{version}.iso -r -J \ - -input-charset iso8859-1 -V "%{name}-%{version}" . +/usr/bin/mkisofs \ + -m 'virtio-win*.vfd' \ + -m vfddrivers \ + -m %{qemu_ga_win_build} \ + -o %{name}-%{version}.iso \ + -r -iso-level 4 \ + -input-charset iso8859-1 \ + -V "%{name}-%{version}" . + %install %{__install} -d -m0755 %{buildroot}%{_datadir}/%{name} @@ -103,12 +127,20 @@ popd %{__ln_s} %{name}-%{version}_servers_amd64.vfd %{buildroot}%{_datadir}/%{name}/%{name}_servers_amd64.vfd %endif +%{__cp} -a vfddrivers %{buildroot}/%{_datadir}/%{name}/drivers + +# Copy the guest agent .msi into final RPM location %{__mkdir} -p %{buildroot}%{_datadir}/%{name}/guest-agent/ %{__install} -p -m0644 guest-agent/qemu-ga-i386.msi %{buildroot}%{_datadir}/%{name}/guest-agent/qemu-ga-i386.msi %{__install} -p -m0644 guest-agent/qemu-ga-x86_64.msi %{buildroot}%{_datadir}/%{name}/guest-agent/qemu-ga-x86_64.msi -%{__cp} -a vfddrivers %{buildroot}/%{_datadir}/%{name}/drivers + +# Copy virtio-win install .msi into final RPM location +%{__mkdir} -p %{buildroot}%{_datadir}/%{name}/installer/ +%{__install} -p -m0644 virtio-win-gt-x86.msi %{buildroot}%{_datadir}/%{name}/installer/ +%{__install} -p -m0644 virtio-win-gt-x64.msi %{buildroot}%{_datadir}/%{name}/installer/ + %files @@ -121,9 +153,59 @@ popd %endif %{_datadir}/%{name}/drivers %{_datadir}/%{name}/guest-agent/*.msi - +%{_datadir}/%{name}/installer/*.msi %changelog +* Tue Mar 10 2020 Danilo C. L. de Paula - 1.9.11-1.el8 +- Resolves: rhbz#1790455 + (Add guest-get-devices command to qemu-ga-win) +- Resolves: rhbz#1802452 +- Resolves: rhbz#1791147 +- Resolves: rhbz#1794609 +- Resolves: rhbz#1791153 +- Resolves: rhbz#1788042 +- Resolves: rhbz#1785544 +- Resolves: rhbz#1785522 +- Resolves: rhbz#1783953 +- Resolves: rhbz#1783906 +- Resolves: rhbz#1783880 +- Resolves: rhbz#1782370 +- Resolves: rhbz#1711743 +- Resolves: rhbz#1745818 +- Resolves: rhbz#1549602 +- Resolves: rhbz#1549597 +- Resolves: rhbz#1549596 +- Resolves: rhbz#1549595 +- Resolves: rhbz#1549577 + +* Thu Dec 19 2019 Danilo C. L. de Paula - 1.9.10-3.el8 +- Resolves: rhbz#1784745 + ([virto-win] virtio input drivers are not installed via virtio-win-installer) +- Resolves: rhbz#1784744 + ([virtio-win] guest can not boot up due to virtio-win-installer remove option uninstalls all drivers including OS driver) +- Resolves: rhbz#1784760 + ([virtio-win] drivers can not be installed via virtio-win-installer on win2012 guest) + +* Tue Dec 17 2019 Danilo C. L. de Paula - 1.9.10-2.el8 +- Include the installers +- Resolves: rhbz#1745298 + ([RFE] Add installer to virtio-win iso) + +* Mon Dec 16 2019 Danilo C. L. de Paula - 1.9.10-1.el8 +- Update to build 173 +- Resolves: rhbz#1754822 + ([virtio-win][viostor] Add TRIM support. ) + +* Mon Dec 02 2019 Danilo C. L. de Paula - 1.9.10-0.el8 +- Resolves: rhbz#1771814 + (QEMU Guest Agent's version is not correct which is still the old one. ) +- Resolves: rhbz#1751431 + ("guest-get-memory-block-info" is enabled but in fact it is not currently supported ) +- Resolves: rhbz#1733165 + (QEMU Guest Agent For Windows Return Garbled NIC Name ) +- Resolves: rhbz#1754822 + ([virtio-win][viostor] Add TRIM support. ) + * Fri Aug 30 2019 Danilo C. L. de Paula - 1.9.9-3.el8 - Resolves: rhbz#1588425 (virtio-mouse can not passthrough)