rpms/kvm/devel kvm.spec,1.89,1.90

Wed Mar 4 02:30:59 UTC 2009

Author: glommer

Update of /cvs/pkgs/rpms/kvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23025

Modified Files:
	kvm.spec 
Log Message:
use source from qemu package.
use this a a meta package to make migration work properly




Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90

--- kvm.spec	25 Feb 2009 12:15:36 -0000	1.89
+++ kvm.spec	4 Mar 2009 02:30:28 -0000	1.90
@@ -1,40 +1,25 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 84
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
-Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+#Source0: http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 #Source0: http://people.qumranet.com:8888/avi/snapshots/kvm-snapshot-%{snapshot}.tar.gz
-Source1: %{name}.modules
-Patch0: %{name}-62-block-rw-range-check.patch
-Patch1: %{name}-83-compile-fixes.patch
+#Source1: %{name}.modules
+#Patch0: %{name}-62-block-rw-range-check.patch
+#Patch1: %{name}-83-compile-fixes.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL-devel
-# to build the bios
-BuildRequires: dev86
-BuildRequires: iasl
-BuildRequires: zlib-devel
-# to check for binary blobs
-BuildRequires: file
-# TLS / x509 auth in VNC server
-BuildRequires: gnutls-devel
-# for the docs
-BuildRequires: texi2html
-BuildRequires: rsync
 # kvm kernel side is only x86/x86_64 as that's where the hardware is
 ExclusiveArch: %{ix86} x86_64 ia64
-Requires: initscripts >= 8.08-1
-
-# We use the roms on /usr/share/etherboot
-Requires: etherboot-roms-kvm
-
+Requires: qemu-system-x86
 
 %package tools
 Summary: KVM debugging and diagnostics tools
 Group: Development/Tools
+Requires: qemu-kvm-tools
 
 
 %description
@@ -52,111 +37,10 @@
 
 
 %prep
-%setup -q
-
-%patch0 -p1 -b .block-rw-range-check
-%patch1 -p1 -b .compile-fixes
-
-# "configure --kerneldir" looks for this
-# FIXME: kvm-84 or later shouldn't need this anymore, see:
-# http://git.kernel.org/?p=linux/kernel/git/marcelo/kvm-userspace.git;a=commit;h=4f45aa2db
-echo "%{name}-%{version}" > $(pwd)/kernel/.kernelrelease
-
-# we must not use any of the binaries from the qemu/pc-bios/ directory,
-# as they don't have the corresponding sources shipped with them
-rm -f qemu/pc-bios/*.{bin,x,dtb} qemu/pc-bios/openbios-*
-find qemu/pc-bios -exec file {} \; | grep '\(data\|BIOS\|executable\)' && \
-    echo "Found some binary blobs in qemu/pc-bios!" && exit 1
-
 %build
-# systems like rhel build system does not have a recent enough linker so 
-# --build-id works. this option is used fedora 8 onwards for giving info
-# to the debug packages.
-
-build_id_available() {
-    echo "int main () { return 0; }" | gcc -x c -Wl,--build-id - 2>/dev/null
-}
-
-if build_id_available; then
-    qemuldflags="-Wl,--build-id";
-else
-    qemuldflags="";
-fi
-
-
-# we need to install the data bits in a different path
-sed -i 's/datasuffix=\"\/share\/qemu\"/datasuffix=\"\/share\/kvm\"/' qemu/configure
-./configure \
-   --with-patched-kernel \
-   --kerneldir=$(pwd)/kernel \
-   --prefix=%{_prefix} \
-   --qemu-ldflags=$qemuldflags \
-   --disable-blobs \
-   --audio-drv-list=sdl,alsa,oss
-# sdl outputs to alsa or pulseaudio directly depending on what the system has configured
-# alsa works, but causes huge CPU load due to bugs
-# oss works, but is very problematic because it grabs exclusive control of the device causing other apps to go haywire
-
-# build the bios, and fix it's makefile
-sed -i 's/gcc -m32/gcc/' bios/Makefile
-make bios
-
-make vgabios
-
-# we can't use RPM_OPT_FLAGS for the same reasons as qemu (#208026) for the
-# qemu bits.  so let's set it for the other pieces.  this requires some
-# manual keeping up of what is in the kvm tree.
-sed -i 's/CFLAGS =/CFLAGS +=/' user/Makefile
-echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
-make %{?_smp_mflags}
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# we have to have our own copies of the bios/keymaps due to incompat with
-# qemu 0.9.  include the man page
-mv $RPM_BUILD_ROOT/%{_mandir}/man1/qemu.1* $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1
-rm -rf $RPM_BUILD_ROOT/%{_mandir}/man*/qemu-img* $RPM_BUILD_ROOT/%{_docdir}
-rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu-img
-# no shared lib, static libs
-rm -fr $RPM_BUILD_ROOT/%{_includedir} $RPM_BUILD_ROOT/%{_libdir}
-
-# make install gives it bogus execute permissiions
-chmod -x $RPM_BUILD_ROOT/%{_mandir}/man1/qemu-kvm.1*
-
-install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
-for i in bios.bin extboot.bin vgabios.bin vgabios-cirrus.bin
-do
-  install -m 0644 qemu/pc-bios/$i $RPM_BUILD_ROOT/%{_datadir}/%{name}/$i
-done
-
-mv $RPM_BUILD_ROOT/%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT/%{_bindir}/qemu-kvm
-
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
-install -m 0755 user/kvmtrace %{buildroot}/%{_bindir}/
-install -m 0755 user/kvmtrace_format %{buildroot}/%{_bindir}/
-install -m 0755 kvm_stat %{buildroot}/%{_bindir}/
-
-# the pxe etherboot images will be symlinks to the images on
-# /usr/share/etherboot, as KVM doesn't know how to look
-# for other paths, yet.
-pxe_link() {
-  ln -s ../etherboot/$2.rom %{buildroot}/usr/share/kvm/pxe-$1.bin
-}
-
-pxe_link e1000 e1000-82542
-pxe_link ne2k_pci ne
-pxe_link pcnet pcnet32
-pxe_link rtl8139 rtl8139
-pxe_link virtio virtio-net
-
 %post
-# load kvm modules now, so we can make sure no reboot is needed.
-# If there's already a kvm module installed, we don't mess with it
-sh /%{_sysconfdir}/sysconfig/modules/kvm.modules
 
 
 %clean
@@ -164,39 +48,14 @@
 
 
 %files
-%defattr(-,root,root,-)
-%{_bindir}/qemu-kvm
-%{_bindir}/qemu-nbd
-
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/keymaps
-%{_datadir}/%{name}/keymaps/*
-
-%{_datadir}/%{name}/bios.bin
-%{_datadir}/%{name}/extboot.bin
-%{_datadir}/%{name}/pxe-e1000.bin
-%{_datadir}/%{name}/pxe-ne2k_pci.bin
-%{_datadir}/%{name}/pxe-pcnet.bin
-%{_datadir}/%{name}/pxe-rtl8139.bin
-%{_datadir}/%{name}/pxe-virtio.bin
-%{_datadir}/%{name}/vgabios-cirrus.bin
-%{_datadir}/%{name}/vgabios.bin
-
-%{_mandir}/man1/qemu-kvm.1*
-%{_mandir}/man8/qemu-nbd.8*
-
-%{_sysconfdir}/sysconfig/modules/%{name}.modules
-
 
 
 %files tools
-%defattr(-,root,root,-)
-%{_bindir}/kvmtrace
-%{_bindir}/kvmtrace_format
-%{_bindir}/kvm_stat
-
 
 %changelog
+* Tue Mar 03 2009 Glauber Costa <glommer at redhat.com> - 84.3
+- don't do anything here and use qemu package.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 84-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


