From 5b1d8f6b37f4ba59bb500a945c639fe6e794c60d Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Feb 10 2022 19:38:51 +0000 Subject: spec: break out qemu-virtiofsd subpackage Pulled in by qemu-* but not qemu-*-core, like we do for device modules. There's a virtual Provides: vhostuser-backend(fs) indicating this packages is a vhost-user.json fs provider. Use that for the qemu dep, as in the future there will be alternate virtiofsd impl packages in Fedora Signed-off-by: Cole Robinson --- diff --git a/qemu.spec b/qemu.spec index fb67b7b..68bdcf8 100644 --- a/qemu.spec +++ b/qemu.spec @@ -288,7 +288,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu Version: 6.2.0 -Release: 3%{?rcrel}%{?dist}.1 +Release: 4%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -482,6 +482,8 @@ Requires: %{name}-system-xtensa = %{epoch}:%{version}-%{release} Requires: %{name}-img = %{epoch}:%{version}-%{release} Requires: %{name}-tools = %{epoch}:%{version}-%{release} Requires: qemu-pr-helper = %{epoch}:%{version}-%{release} +Requires: vhostuser-backend(fs) + %description %{name} is an open source virtualizer that provides hardware @@ -546,6 +548,15 @@ This package provides the qemu-pr-helper utility that is required for certain SCSI features. +%package -n qemu-virtiofsd +Summary: QEMU virtio-fs shared file system daemon +Provides: vhostuser-backend(fs) +%description -n qemu-virtiofsd +This package provides virtiofsd daemon. This program is a vhost-user backend +that implements the virtio-fs device that is used for sharing a host directory +tree with a guest. + + %package tests Summary: tests for the %{name} package Requires: %{name} = %{epoch}:%{version}-%{release} @@ -1822,6 +1833,12 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_mandir}/man8/qemu-pr-helper.8* +%files -n qemu-virtiofsd +%{_mandir}/man1/virtiofsd.1* +%{_libexecdir}/virtiofsd +%{_datadir}/qemu/vhost-user/50-qemu-virtiofsd.json + + %files tools %{_bindir}/qemu-keymap %{_bindir}/qemu-edid @@ -1847,11 +1864,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_datadir}/icons/* %{_datadir}/%{name}/keymaps/ %{_datadir}/%{name}/linuxboot_dma.bin -%{_datadir}/%{name}/vhost-user/50-qemu-virtiofsd.json %attr(4755, -, -) %{_libexecdir}/qemu-bridge-helper -%{_libexecdir}/virtiofsd %{_mandir}/man1/%{name}.1* -%{_mandir}/man1/virtiofsd.1* %{_mandir}/man7/qemu-block-drivers.7* %{_mandir}/man7/qemu-cpu-models.7* %{_mandir}/man7/qemu-ga-ref.7* @@ -2246,6 +2260,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Thu Feb 10 2022 Cole Robinson - 6.2.0-4 +- Split out qemu-virtiofsd subpackage + * Wed Feb 2 2022 Paolo Bonzini - 2:6.2.0-3 - Fix non-SGX builds