rpms/bochs/devel bochs.spec,1.40,1.41 sources,1.14,1.15

[Glauber Costa]

Author: glommer

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

Modified Files:
	bochs.spec sources 
Log Message:
build kvm bios




Index: bochs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- bochs.spec	6 Mar 2009 05:48:52 -0000	1.40
+++ bochs.spec	11 Mar 2009 16:48:03 -0000	1.41
@@ -1,7 +1,7 @@
 %define githead 04387139e3b
 Name:           bochs
 Version:        2.3.8
-Release:        0.4.git%{githead}%{?dist}
+Release:        0.5.git%{githead}%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
@@ -12,6 +12,12 @@
 # git archive --format=tar --prefix=%{name}-%{version}/ %{githead} | gzip > ../%{name}-%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 
+# This should not live here, but letting it in the kvm package would produce another noarch package we would
+# then have to get rid of in the future. So let it be.
+# git clone git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm-userspace.git
+# git archive --format=tar --prefix=kvm-bios.tar.gz HEAD bios | gzip > ../kvm-bios.tar.gz
+Source1:	kvm-bios.tar.gz
+
 Patch0:	%{name}-0001_bx-qemu.patch
 Patch1:	%{name}-0002_kvm-bios-update-smbios-table-to-report-memory-above-4g.patch
 Patch2:	%{name}-0003_kvm-bios-generate-mptable-unconditionally.patch
@@ -32,7 +38,7 @@
 #BuildRequires:  wxGTK-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
-BuildRequires:	dev86
+BuildRequires:	dev86 iasl
 %endif
 Requires:	%{name}-bios = %{version}-%{release}
 Requires:	vgabios
@@ -99,6 +105,9 @@
 %patch10 -p1
 %patch11 -p0 -z .nonet
 
+%setup -b 1
+mv ../kvm-bios ./
+
 # Fix up some man page paths.
 sed -i \
   -e 's|/usr/local/share/doc/bochs/|%{_docdir}/%{name}-%{version}/|' \
@@ -153,6 +162,9 @@
 %ifarch %{ix86} x86_64
 cd bios
 make bios
+cd ../kvm-bios/bios
+make bios
+cp BIOS-bochs-latest ../../bios/BIOS-bochs-kvm
 %endif
 
 %install
@@ -203,6 +215,11 @@
 
 
 %changelog
+* Wed Mar 11 2009 Glauber Costa <glommer at redhat.com> 2.3.8-0.5.git04387139e3b
+- kvm needs a slightly different bios due to irq routing, so build it too.
+  from kvm source. This is not ideal, but avoids the creation of yet another
+  noarch subpackage.
+
 * Fri Mar 06 2009 Glauber Costa <glommer at redhat.com> 2.3.8-0.4.git04387139e3b
 - Provide and Obsolete bochs-bios-data to make sure no one is harmed during
   updates.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bochs/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Mar 2009 17:33:46 -0000	1.14
+++ sources	11 Mar 2009 16:48:03 -0000	1.15
@@ -1 +1,2 @@
 a360358375ad00487f0f26dcc667a4a4  bochs-2.3.8.tar.gz
+9fb228d2176430963c4d2d8afcf2faff  kvm-bios.tar.gz