Accepting request 126075 from home:a_faerber:branches:Virtualization

Add qemu-guest-agent package for qemu-ga, and add qemu-img and qemu-nbd to qemu-tools package

OBS-URL: https://build.opensuse.org/request/show/126075
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=88
This commit is contained in:
Andreas Färber 2012-06-26 08:33:26 +00:00 committed by Git OBS Bridge
parent 484a0352cb
commit c80ddfc0ec
3 changed files with 82 additions and 12 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jun 25 19:29:05 UTC 2012 - afaerber@suse.de
- include qemu-img and qemu-nbd in qemu-tools package
-------------------------------------------------------------------
Wed Jun 25 18:30:54 UTC 2012 - afaerber@suse.de
- add qemu-guest-agent package
-------------------------------------------------------------------
Mon Jun 25 17:40:36 UTC 2012 - agraf@suse.com

View File

@ -98,9 +98,8 @@ BuildRequires: pwdutils
BuildRequires: python
Requires: /usr/sbin/groupadd
Requires: pwdutils
Requires: qemu-tools
Requires: timezone
Requires: virt-utils
Recommends: qemu-tools
%description
QEMU is an extremely well-performing CPU emulator that allows you to
@ -124,6 +123,20 @@ as PC and PowerMac systems.
This sub-package contains various tools, including a bridge helper.
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
Provides: qemu:%_bindir/qemu-ga
%description guest-agent
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains the guest agent.
%package linux-user
Summary: Universal CPU emulator -- Linux User binaries
Group: System/Emulators/PC
@ -187,7 +200,10 @@ mkdir -p dynamic
--disable-spice
%endif
make %{?jobs:-j%jobs} V=1
mv *-softmmu/qemu-system-* qemu-io qemu-bridge-helper dynamic || true
mv *-softmmu/qemu-system-* dynamic
mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
mv qemu-img.1 qemu-nbd.8 dynamic
mv qemu-ga dynamic
make clean
# build userland emus
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@ -204,15 +220,20 @@ make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
rm -f $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%ifnarch %ix86 x86_64
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
@ -244,7 +265,7 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-, root, root)
%doc COPYING COPYING.LIB Changelog README TODO VERSION qemu-doc.html qemu-tech.html
%_bindir/qemu-system-*
%doc %_mandir/man[18]/qemu*.[18].gz
%doc %_mandir/man1/qemu.1.gz
%_datadir/%name
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
@ -254,10 +275,19 @@ rm -rf ${RPM_BUILD_ROOT}
%files tools
%defattr(-, root, root)
%doc %_mandir/man1/qemu-img.1.gz
%doc %_mandir/man8/qemu-nbd.8.gz
%_bindir/qemu-io
%_bindir/qemu-img
%_bindir/qemu-nbd
%verify(not mode) %_libexecdir/qemu-bridge-helper
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga
%files linux-user
%defattr(-, root, root)
%_bindir/qemu-alpha

View File

@ -74,10 +74,9 @@ BuildRequires: libvdeplug3-devel
BuildRequires: pwdutils
BuildRequires: python
Requires: pwdutils
Requires: qemu-tools
Requires: timezone
Requires: virt-utils
Requires: /usr/sbin/groupadd
Recommends: qemu-tools
%description
QEMU is an extremely well-performing CPU emulator that allows you to
@ -101,6 +100,20 @@ as PC and PowerMac systems.
This sub-package contains various tools, including a bridge helper.
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
Group: System/Emulators/PC
Provides: qemu:%_bindir/qemu-ga
%description guest-agent
QEMU is an extremely well-performing CPU emulator that allows you to
choose between simulating an entire system and running userspace
binaries for different architectures under your native operating
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
as PC and PowerMac systems.
This sub-package contains the guest agent.
%package linux-user
Summary: Universal CPU emulator -- Linux User binaries
Group: System/Emulators/PC
@ -141,7 +154,10 @@ mkdir -p dynamic
--disable-spice
%endif
make %{?jobs:-j%jobs} V=1
mv *-softmmu/qemu-system-* qemu-io qemu-bridge-helper dynamic || true
mv *-softmmu/qemu-system-* dynamic
mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic
mv qemu-img.1 qemu-nbd.8 dynamic
mv qemu-ga dynamic
make clean
# build userland emus
./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
@ -158,15 +174,20 @@ make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%_mandir/man1/qemu-img.1
rm -f $RPM_BUILD_ROOT/%_mandir/man8/qemu-nbd.8
rm -fr $RPM_BUILD_ROOT/%_datadir/doc
install -m 755 dynamic/qemu-system-* $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-io $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-img $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-nbd $RPM_BUILD_ROOT/%_bindir
install -m 755 dynamic/qemu-ga $RPM_BUILD_ROOT/%_bindir
install -d -m 755 $RPM_BUILD_ROOT/%_sbindir
install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir
install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir
install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man1
install -m 644 dynamic/qemu-img.1 $RPM_BUILD_ROOT/%_mandir/man1
install -d -m 755 $RPM_BUILD_ROOT/%_mandir/man8
install -m 644 dynamic/qemu-nbd.8 $RPM_BUILD_ROOT/%_mandir/man8
install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%ifnarch %ix86 x86_64
ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386
@ -198,7 +219,7 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-, root, root)
%doc COPYING COPYING.LIB Changelog README TODO VERSION qemu-doc.html qemu-tech.html
%_bindir/qemu-system-*
%doc %_mandir/man[18]/qemu*.[18].gz
%doc %_mandir/man1/qemu.1.gz
%_datadir/%name
%ifnarch %ix86 x86_64 ia64
%dir /emul/ia32-linux
@ -208,10 +229,19 @@ rm -rf ${RPM_BUILD_ROOT}
%files tools
%defattr(-, root, root)
%doc %_mandir/man1/qemu-img.1.gz
%doc %_mandir/man8/qemu-nbd.8.gz
%_bindir/qemu-io
%_bindir/qemu-img
%_bindir/qemu-nbd
%verify(not mode) %_libexecdir/qemu-bridge-helper
%dir %_sysconfdir/%name
%config %_sysconfdir/%name/bridge.conf
%files guest-agent
%defattr(-, root, root)
%attr(755,root,kvm) %_bindir/qemu-ga
%files linux-user
%defattr(-, root, root)
%_bindir/qemu-alpha