- added TODO

[packages/qemu.git] / qemu.spec

diff --git a/qemu.spec b/qemu.spec
index 7606579af62d51d4c46d4c2a8cf1b3e79a795e89..e5489eeb955949a42eef3fd31951f11db2639e67 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,30 +1,46 @@
+#
+# TODO:
+# - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed.
+#
+# Conditional build:
+%bcond_with    kqemu                   # with QEMU accelerator module
+%bcond_with cflags_passing     # with passing rpmcflags to Makefiles
+#
 Summary:       QEMU CPU Emulator
 Summary(pl):   QEMU - emulator procesora
 Name:          qemu
-Version:       0.6.1
-Release:       2
+Version:       0.7.0
+Release:       1.2
 License:       GPL
 Group:         Applications/Emulators
+#Source0Download: http://fabrice.bellard.free.fr/qemu/download.html
 Source0:       http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz
-# Source0-md5: f1b5e103321832d2786dd4110f6c8ae4
+# Source0-md5: 234e9ace03b00259bb57dc5a9c633056
+%if %{with kqemu}
+Source1:       http://fabrice.bellard.free.fr/qemu/kqemu-0.6.2-1.tar.gz
+# NoSource1-md5:       c6bb3b40fb3d526d731eb0f1f9dee7ee
+NoSource:      1
+%endif
 Patch0:                %{name}-nostatic.patch
 Patch1:                %{name}-DESTDIR.patch
-#Patch2:               %{name}-amd64.patch
-Patch3:                %{name}-longjmp.patch
-Patch4:                %{name}-gcc34.patch
-#Patch0:               qemu-0.5.0-cvsupdates.patch.bz2
-#Patch1:               qemu-0.1.6-glibc23-ldscripts.patch.bz2
-#Patch2:               qemu-0.5.0-sdl-static-libs.patch.bz2
-#Patch3:               qemu-0.5.0-DESTDIR.patch.bz2
-#Patch4:               qemu-0.5.0-lib64.patch.bz2
-#Patch5:               qemu-0.5.0-amd64.patch.bz2
-#Patch6:               qemu-0.5.0-vl-amd64.patch.bz2
+Patch2:                %{name}-longjmp.patch
+Patch3:                %{name}-dot.patch
+Patch4:                %{name}-initrd_load_addr.patch
+Patch5:                %{name}-gcc4_x86.patch
+Patch6:                %{name}-gcc4_ppc.patch
 URL:           http://fabrice.bellard.free.fr/qemu/
-BuildRequires: SDL-devel
-ExclusiveArch: %{ix86} amd64 ppc
+BuildRequires: SDL-devel >= 1.2.1
+BuildRequires: sed >= 4.0
+%if %{with kqemu}
+BuildRequires: kernel-source
+%endif
+ExclusiveArch: %{ix86} %{x8664} ppc
 # sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# some SPARC boot image in ELF format
+%define                _noautostrip    .*%{_datadir}/qemu/proll.elf
+
 %description
 QEMU is a FAST! processor emulator. By using dynamic translation it
 achieves a reasonnable speed while being easy to port on new host
@@ -58,30 +74,51 @@ aby dzia
   pecetów na pojedynczym serwerze.
 
 %prep
-%setup -q
+%setup -q %{?with_kqemu:-a1}
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
-#%patch4 -p1
-
-#%patch0 -p1 -b .cvsupdates
-#%patch1 -p1 -b .glibc23-ldscripts
-#%patch2 -p1 -b .sdl-static-libs
-#%patch3 -p1 -b .DESTDIR
-#%patch4 -p1 -b .lib64
-#%patch5 -p1 -b .amd64
-# needs to 64-bit clean softmmu code or MAP_32BIT physical_ram_base
-# but other problems remain.
-#%patch6 -p1 -b .vl-amd64
+%patch4 -p1
+%patch5 -p0
+%patch6 -p1
+
+%{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure
+
+# cannot use optflags on x86 - they cause "no register to spill" errors
+%if %{with cflags_passing}
+%{__sed} -i -e 's/-Wall -O2 -g/-Wall %{rpmcflags}/' Makefile Makefile.target
+%endif
+
+%{?with_kqemu:echo -n > kqemu/install.sh}
 
 %build
+
+%if %{with kqemu}
+cp -rdp %{_kernelsrcdir}/ .
+rm -f linux/.config
+cp -f linux/config-smp linux/.config
+make -C linux modules_prepare
+%endif
+
+# --extra-cflags don't work (overridden by CFLAGS in Makefile*)
+# they can be passed if the cflags_passing bcond is used
 ./configure \
        --prefix=%{_prefix} \
-       --cc=%{__cc} \
-       --make=%{__make} \
+       --cc="%{__cc}" \
+  %if %{with kqemu}
+       --enable-kqemu }\
+       --kernel-path=`pwd`/linux \
+  %endif
+       --make="%{__make}"
 
-%{__make}
+%{__make} 
+
+%if %{with kqemu}
+mv kqemu/kqemu.ko kqemu/kqemu.smp
+cp -f linux/config-up linux/.config
+make -C linux modules_prepare
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,12 +126,37 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with kqemu}
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
+install kqemu/kqemu.smp $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/kqemu.ko
+install kqemu/kqemu.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%if %{with kqemu}
+%depmod
+
+%banner %{name} -e << EOF
+To enable qemu accelerator (kqemu), You must manually create device for it:
+mknod /dev/kqemu c 250 0
+chmod 666 /dev/kqemu
+
+And before start qemu, the kqemu kernel module must be loaded:
+modprobe kqemu
+EOF
+%endif
+
+%postun
+%{?with_kqemu: %depmod}
+
 %files
 %defattr(644,root,root,755)
-%doc README qemu-doc.html
+%doc README qemu-doc.html qemu-tech.html
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/qemu
 %{_mandir}/man1/qemu.1*
+%{_mandir}/man1/qemu-img.1*
+%{?with_kqemu: /lib/*}