From c0ee9876b5e6b65a927cd7abc42c1ab27bfa86ff Mon Sep 17 00:00:00 2001 From: Ming Yang Date: Fri, 25 Dec 2020 14:45:46 +0800 Subject: [PATCH] spec: Add two packages. 1. Add qemu-block-rbd package. 2. Add qemu-block-ssh package. Signed-off-by: Ming Yang --- qemu.spec | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/qemu.spec b/qemu.spec index b8986019..6cec27e9 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 36 +Release: 37 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY @@ -328,6 +328,10 @@ BuildRequires: pam-devel BuildRequires: perl-Test-Harness BuildRequires: python3-devel BuildRequires: librbd-devel +BuildRequires: krb5-devel +BuildRequires: libssh-devel +BuildRequires: glib2 + %ifarch aarch64 BuildRequires: libfdt-devel BuildRequires: virglrenderer-devel @@ -375,6 +379,16 @@ Summary: QEMU command line tool for manipulating disk images %description img This package provides a command line tool for manipulating disk images +%package block-rbd +Summary: Qemu-block-rbd +%description block-rbd +This package provides RBD support for Qemu + +%package block-ssh +Summary: Qemu-block-ssh +%description block-ssh +This package provides block-ssh support for Qemu + %ifarch %{ix86} x86_64 %package seabios Summary: QEMU seabios @@ -428,6 +442,8 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id" --enable-cap-ng \ --enable-vhost-user \ --enable-tpm \ + --enable-modules \ + --enable-libssh \ %ifarch aarch64 --enable-fdt \ --enable-virglrenderer \ @@ -511,7 +527,16 @@ rm -f %{buildroot}%{_datadir}/%{name}/edk2* rm -rf %{buildroot}%{_datadir}/%{name}/firmware rm -rf %{buildroot}%{_datadir}/%{name}/opensbi* rm -rf %{buildroot}%{_datadir}/%{name}/qemu-nsis.bmp - +rm -rf %{buildroot}%{_libdir}/%{name}/audio-oss.so +rm -rf %{buildroot}%{_libdir}/%{name}/audio-pa.so +rm -rf %{buildroot}%{_libdir}/%{name}/block-curl.so +rm -rf %{buildroot}%{_libdir}/%{name}/block-iscsi.so +rm -rf %{buildroot}%{_libdir}/%{name}/block-gluster.so +rm -rf %{buildroot}%{_libdir}/%{name}/ui-curses.so +rm -rf %{buildroot}%{_libdir}/%{name}/ui-gtk.so +rm -rf %{buildroot}%{_libdir}/%{name}/ui-sdl.so +rm -rf %{buildroot}%{_libexecdir}/vhost-user-gpu +rm -rf %{buildroot}%{_datadir}/%{name}/vhost-user/50-qemu-gpu.json for f in %{buildroot}%{_bindir}/* %{buildroot}%{_libdir}/* \ %{buildroot}%{_libexecdir}/*; do @@ -624,6 +649,12 @@ getent passwd qemu >/dev/null || \ %{_bindir}/qemu-io %{_bindir}/qemu-nbd +%files block-rbd +%{_libdir}/%{name}/block-rbd.so + +%files block-ssh +%{_libdir}/%{name}/block-ssh.so + %ifarch %{ix86} x86_64 %files seabios %{_datadir}/%{name}/bios-256k.bin @@ -631,6 +662,10 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Fri Dec 25 2020 Huawei Technologies Co., Ltd +- add qemu-block-rbd package +- add qemu-block-ssh package + * Wed Nov 11 2020 Huawei Technologies Co., Ltd - hw: usb: hcd-ohci: check for processed TD before retire - hw: ehci: check return value of 'usb_packet_map' -- Gitee