diff --git a/.gitignore b/.gitignore index 1a88b90..210703e 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,21 @@ /virtio-win-1.9.8-4-bin-for-rpm.tar.gz /virtio-win-1.9.9-bin-for-rpm.tar.gz /virtio-win-prewhql-0.1-172-sources.zip +/mingw-qemu-ga-win-101.0.0-5.el7ev.src.rpm +/qemu-ga-win-101.0.0-5.el7ev.noarch.rpm +/virtio-win-1.9.10-bin-for-rpm.tar.gz +/virtio-win-1.9.10-2-bin-for-rpm.tar.gz +/virtio-win-prewhql-0.1-173-sources.zip +/virtio-win-gt-x64.msi +/virtio-win-gt-x86.msi +/virtio-win-installer-1.9.10-1-sources.zip +/virtio-win-installer-1.9.10-3-sources.zip +/virtio-win-gt-x64-1.9.10-3.msi +/virtio-win-gt-x86-1.9.10-3.msi +/virtio-win-1.9.11-bin-for-rpm.tar.gz +/qemu-ga-win-101.1.0-1.el7ev.noarch.rpm +/mingw-qemu-ga-win-101.1.0-1.el7ev.src.rpm +/virtio-win-prewhql-0.1-180-sources.zip +/virtio-win-gt-x86-1.9.11-1.msi +/virtio-win-gt-x64-1.9.11-1.msi +/virtio-win-installer-1.9.11-1-sources.zip diff --git a/sources b/sources index fe6b9f7..28a476c 100644 --- a/sources +++ b/sources @@ -1,5 +1,9 @@ SHA512 (qxl-win-unsigned-0.1-24-sources.zip) = 5fa5e63f37c9f25a164f8e9f0cb72ff0e333ac32dee55546f23f6555f1c66cbac5d6904a7f85dda45f3dc3e077c46b65071ff397d792b459fc58b6dd87f402f9 -SHA512 (mingw-qemu-ga-win-100.0.0.0-3.el7ev.src.rpm) = 086545b615f451db4102eb98ab51f31ec0a29bec98cea9ab0126fa78994bb02ac7278fb92fbe3754fbae10d49f22e83387bebc359a4af5d407d2f83b27f3c7c0 -SHA512 (qemu-ga-win-100.0.0.0-3.el7ev.noarch.rpm) = c2856441844aabb6ecb7cdefebf6355723f54d6a7902f6fae46249e68074130f07517c58930bec9f458e23b6e57c9992b63cd6df99282a03b7f34773a22ae893 -SHA512 (virtio-win-prewhql-0.1-172-sources.zip) = d749513e03e33357581a322674fff8366f68a4e102cb4998618f170cd3b93d13f2be84e3ea37b2665bd2b9b878356ccd12a73e2903a6a8e5b4eaa960c2003718 -SHA512 (virtio-win-1.9.9-bin-for-rpm.tar.gz) = c3d97c3bea5b8ad1a6042bc0d5a1ca5b246ae70ae10cc3ee3c21924ec2eb6dabbe84fc2e0c07236106bd1a0ac87d71cbcfb0fed609a05dc3355ff545ead6ac48 +SHA512 (virtio-win-prewhql-0.1-173-sources.zip) = ebe893e4e0e32c83149ed30ba2d6fc61cf1158d42485fbcd8ad35d69b589f4487527854e8f3d1ed98017376348072d82a0456f3112ddcb5ea4fb7fde568facb4 +SHA512 (qemu-ga-win-101.1.0-1.el7ev.noarch.rpm) = 2a4ab2ca1da9ed83b1c3311e18eba9a29a752457173bdf0cc15ea79a5ee2cb9f1392c03edf34f411e148bcbbdf3d3e9a2765372e8c89490263084927f354e1de +SHA512 (mingw-qemu-ga-win-101.1.0-1.el7ev.src.rpm) = fc03eedf457b7f292480e3c77bf674c153822decd9f62b9feede0f1cc2181c787dc46e92d4a6c8de61c3678f1b83e300c3530e745cb07612b324f3bddbec6a9e +SHA512 (virtio-win-prewhql-0.1-180-sources.zip) = df62fe43b47f1f1afb27d801ff2dde4622688b9b983ec00abbd20ba5b90d10246e63d073eed30270ae2dda690fa0e56b4f68fafd59c8d66c7591087fd1f5f167 +SHA512 (virtio-win-1.9.11-bin-for-rpm.tar.gz) = df052bbd433fb7e1b6dddf3ad0e368eb5a447dd081897f8267f9e51b3f133846cbbe8e4f7065d606d6067a9c953c4d47100b42dc68c698b659485604c23260f5 +SHA512 (virtio-win-gt-x86-1.9.11-1.msi) = 84285c5d03ce731c71612c1ff0f2a997e18620439a932de9d6d0f3ad4ba097b28d60d9d2c8d354981d71852c7e7e876a0f09d8312b8df52371859be2ec81e589 +SHA512 (virtio-win-gt-x64-1.9.11-1.msi) = 515c26e68f38225173e41bc2f95b8ab10035aa304bfde029921589867e82cec5c13ae9334f5b06978bd728a1258fb8b8bd3b0bba47f6e3d3b798c340fee74362 +SHA512 (virtio-win-installer-1.9.11-1-sources.zip) = 98d88cd93c7eb362421451b11dca6782019f2da516c5410b3c77f8612c56f545f15bbb2a974df8cbfb10ec06f540131181904934f61e5abc184cf7eb7f1f2db7 diff --git a/virtio-win.spec b/virtio-win.spec index 0e52f1a..d661095 100644 --- a/virtio-win.spec +++ b/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)