rpms/kvm/F-8 kvm.spec,1.35,1.35.2.1

[Eduardo Habkost]

Author: ehabkost

Update of /cvs/pkgs/rpms/kvm/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30010

Modified Files:
      Tag: private-ehabkost-no_pcbios_binaries-branch
	kvm.spec 
Log Message:
Build _all_ qemu/pc-bios binaries from source




Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/F-8/kvm.spec,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- kvm.spec	27 May 2008 13:28:11 -0000	1.35
+++ kvm.spec	26 Sep 2008 20:42:41 -0000	1.35.2.1
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 60
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -30,6 +30,9 @@
 ExclusiveArch: %{ix86} x86_64
 Requires: initscripts >= 8.08-1
 
+# We use the roms on /usr/share/etherboot
+Requires: etherboot-roms-kvm
+
 %description
 KVM (for Kernel-based Virtual Machine) is a full virtualization solution
 for Linux on x86 hardware.
@@ -45,12 +48,23 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+# 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/*
+
 
 %build
 # 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 --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix} --qemu-ldflags="-Wl,--build-id" --enable-alsa
 
+# build the bios, and fix it's makefile
+sed -i 's/gcc -m32/gcc/' bios/Makefile
+make bios
+
+# build the vgabios
+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.
@@ -58,10 +72,6 @@
 echo "CFLAGS=$RPM_OPT_FLAGS" >> user/config.mak
 make %{?_smp_mflags}
 
-# build the bios, and fix it's makefile
-sed -i 's/gcc -m32/gcc/' bios/Makefile
-make bios
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -87,6 +97,20 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules
 install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/kvm.modules
 
+
+# the pxe etherboot images will be symlinks to the images on
+# /usr/share/etherboot
+
+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-net virtio-net
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,6 +123,9 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Fri Sep 26 2008 Eduardo Habkost <ehabkost at redhat.com> - 60.7.fc10
+- Build _all_ qemu/pc-bios/ binaries from source
+
 * Tue May 27 2008 Glauber Costa <gcosta at redhat.com> - 60-6.fc8
 - Fix Cirrus heap overflow vulnerability (#448524)