diff --git a/.gitignore b/.gitignore index ccd1805..3796a90 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,10 @@ /virtio-win-prewhql-0.1-141-sources.zip /virtio-win-1.9.3-bin-for-rpm.tar.gz /virtio-win-1.9.6-bin-for-rpm.tar.gz +/virtio-win-1.9.7-bin-for-rpm.tar.gz +/mingw-qemu-ga-win-100.0.0.0-3.el7ev.src.rpm +/qemu-ga-win-100.0.0.0-3.el7ev.noarch.rpm +/virtio-win-prewhql-0.1-171-sources.zip +/virtio-win-1.9.8-bin-for-rpm.tar.gz +/virtio-win-1.9.8-2-bin-for-rpm.tar.gz +/virtio-win-1.9.8-4-bin-for-rpm.tar.gz diff --git a/sources b/sources index 3b77af0..325c417 100644 --- a/sources +++ b/sources @@ -1,5 +1,6 @@ SHA512 (qxl-win-unsigned-0.1-24-sources.zip) = 5fa5e63f37c9f25a164f8e9f0cb72ff0e333ac32dee55546f23f6555f1c66cbac5d6904a7f85dda45f3dc3e077c46b65071ff397d792b459fc58b6dd87f402f9 -SHA512 (mingw-qemu-ga-win-7.6.2-2-installers.zip) = 518331d9cc66e0ec1d920ed07dac55eeb5411aab81ff4ce282684347ec9c87b8d40ccdec165f8cb7f7714393a9e372e5e358c9c9b3b290fbe155474f517a6254 -SHA512 (mingw-qemu-ga-win-7.6.2-2-sources.zip) = 806ecb4a39fc1aae87186c81e49d635352aa881e811848d31d2d33b866fe80a554ca40c1428e1e2ee81fcdbb29ff79cfd992adba4f47789f8d13d02a152a2d26 -SHA512 (virtio-win-prewhql-0.1-160-sources.zip) = 5aa85dc7da202ed4508725921c8e629ae612069b033afdb8a4720262651b4d7f17dbf47dee470deab3901c0d524517ed1d0db7ca290d69432da6978f6ff24dc3 -SHA512 (virtio-win-1.9.6-bin-for-rpm.tar.gz) = cd6c7558d5ce89d10bebcaea6431c0b817ccbf861d00a0743338b47d8452a4058f4a8cd219c47181bcff23aa5a7dfa05ea3f443b4eec9d451c54512abf7aec95 +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-171-sources.zip) = f4c7bcc775bdd94bf710f746835372d89971a9bd4d3f60650cb27468e3d6dec404dbc9dfe916cb5ad4c44b5d8b7bb3a37e31729b7e8f8dbe83952dc4aa6e00ea +SHA512 (virtio-win-1.9.8-2-bin-for-rpm.tar.gz) = 3562879e039647dbca8929d97e47c6514c9b4127671b5f39e66c994b781b67f63f65e83f2d41f219351f916686ca5e960a4f78e495f9c29f0b946fbc4008209d +SHA512 (virtio-win-1.9.8-4-bin-for-rpm.tar.gz) = 9b4232a7d869d3a46f179d7616bc13e82cf18448d5b6b82d38e97dcc08b16339c63ba76258d54ec0ea88bb99b751a3c1a43377bb62c29da6b91971500b1ae973 diff --git a/virtio-win.spec b/virtio-win.spec index 986a66f..dcbaddf 100644 --- a/virtio-win.spec +++ b/virtio-win.spec @@ -1,39 +1,50 @@ -# Note: This spec file is largely shared with the public virtio-win drivers -# shipped on fedoraproject.org. If you make any changes to this file that -# affect the RPM content, please submit a patch them to the upstream spec -# file hosted at: https://github.com/crobinso/virtio-win-pkg-scripts +# -*- rpm-spec -*- -%global virtio_win_prewhql_build virtio-win-prewhql-0.1-160 -%global qemu_ga_win_build mingw-qemu-ga-win-7.6.2-2 +# Note: This spec file is largely shared with the public virtio-win drivers +# shipped on fedora sites. The canonical location is here: +# +# 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. + +%global virtio_win_prewhql_build virtio-win-prewhql-0.1-171 +%global qemu_ga_win_build qemu-ga-win-100.0.0.0-3.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 Summary: VirtIO para-virtualized drivers for Windows(R) Name: virtio-win -Version: 1.9.6 -Release: 4%{?dist} +Version: 1.9.8 +Release: 5%{?dist} Group: Applications/System URL: http://www.redhat.com/ 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 -%else -# virtio-win: https://github.com/YanVugenfirer/kvm-guest-drivers-windows/blob/master/LICENSE +# virtio-win drivers are licensed under the BSD license, qxldod under Apache, +# 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 +# qxldod: https://github.com/vrozenfe/qxl-dod/blob/master/LICENSE # qemu-ga: http://git.qemu.org/?p=qemu.git;a=blob;f=COPYING -License: GPLv2 -%endif +License: BSD and Apache and GPLv2 # Already built files -Source1: %{name}-%{version}-bin-for-rpm.tar.gz -Source2: %{qemu_ga_win_build}-installers.zip +Source1: %{name}-%{version}-4-bin-for-rpm.tar.gz +Source2: %{qemu_ga_win_build}.noarch.rpm # Source files shipped in the srpm Source3: %{virtio_win_prewhql_build}-sources.zip -Source4: %{qxl_build}-sources.zip -Source5: %{qemu_ga_win_build}-sources.zip +Source4: mingw-%{qemu_ga_win_build}.src.rpm +Source5: %{qxl_build}-sources.zip +%if 0%{?fedora} +Source6: %{qxlwddm_build}-sources.zip +%endif + BuildRequires: /usr/bin/mkisofs @@ -45,8 +56,16 @@ Windows(R) guests. %prep %setup -q -T -b 1 -n %{name}-%{version} -%setup -q -T -a 2 -n %{name}-%{version} -D +mkdir -p guest-agent +mkdir -p %{qemu_ga_win_build} +pushd %{qemu_ga_win_build}/ && rpm2cpio %{SOURCE2} | cpio -idmv +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/ + +%if 0%{?rhel} > 7 # Dropping unsupported Windows versions. # It's done here to fix two issues at the same time: do not # release them in iso AND as binary drivers. @@ -54,15 +73,14 @@ Windows(R) guests. %{__rm} */2k3/ vfddrivers/*/Win2003 -rf %{__rm} */xp/ vfddrivers/*/WinXP -rf %{__rm} smbus -rf +%endif %build -%{__mv} %{qemu_ga_win_build} guest-agent # Generate .iso -/usr/bin/mkisofs -m 'virtio-win*.vfd' -m vfddrivers -o %{name}-%{version}.iso -r -J \ +/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}" . - %install %{__install} -d -m0755 %{buildroot}%{_datadir}/%{name} @@ -70,8 +88,27 @@ Windows(R) guests. %{__install} -p -m0644 %{name}-%{version}.iso %{buildroot}%{_datadir}/%{name} %{__ln_s} %{name}-%{version}.iso %{buildroot}%{_datadir}/%{name}/%{name}.iso + +# RHEL-8 does not support vfd images +%if 0%{?rhel} <= 7 +# Install .vfd files, create non-versioned symlinks +%{__install} -p -m0644 %{name}-%{version}_x86.vfd %{buildroot}%{_datadir}/%{name} +%{__ln_s} %{name}-%{version}_x86.vfd %{buildroot}%{_datadir}/%{name}/%{name}_x86.vfd +%{__install} -p -m0644 %{name}-%{version}_amd64.vfd %{buildroot}%{_datadir}/%{name} +%{__ln_s} %{name}-%{version}_amd64.vfd %{buildroot}%{_datadir}/%{name}/%{name}_amd64.vfd + +%{__install} -p -m0644 %{name}-%{version}_servers_x86.vfd %{buildroot}%{_datadir}/%{name} +%{__ln_s} %{name}-%{version}_servers__x86.vfd %{buildroot}%{_datadir}/%{name}/%{name}_servers_x86.vfd +%{__install} -p -m0644 %{name}-%{version}_servers_amd64.vfd %{buildroot}%{_datadir}/%{name} +%{__ln_s} %{name}-%{version}_servers_amd64.vfd %{buildroot}%{_datadir}/%{name}/%{name}_servers_amd64.vfd +%endif + + +%{__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 -%{__cp} -a guest-agent %{buildroot}/%{_datadir}/%{name} %files @@ -79,11 +116,18 @@ Windows(R) guests. %dir %{_datadir}/%{name} %{_datadir}/%{name}/%{name}-%{version}.iso %{_datadir}/%{name}/%{name}.iso +%if 0%{?rhel} <= 7 +%{_datadir}/%{name}/*.vfd +%endif %{_datadir}/%{name}/drivers -%{_datadir}/%{name}/guest-agent +%{_datadir}/%{name}/guest-agent/*.msi %changelog +* Tue Jun 25 2019 Danilo C. L. de Paula - 1.9.8-5.el8 +- Resolves: rhbz#1715121 + (Move virtio-win to the regular RHEL channel) + * Tue Sep 11 2018 Danilo C. L. de Paula - 1.9.6-4 - Resolves: BZ#1353099 During the fix for 1353099, the smbus become empty. So it needs to be