X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=qemu.spec;h=530d17022f8da62545d9168e8e13ff09de84fdfb;hb=0d2efd95917ca5766e092b4dc68877a00b9de6cc;hp=3a3986a6d0b896b765e76066458962f41e6d26db;hpb=080a0c6f739c60b821f80248879bc5c6c90d8c8a;p=packages%2Fqemu.git diff --git a/qemu.spec b/qemu.spec index 3a3986a..530d170 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,49 +1,59 @@ # # TODO: # - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed. +# - kqemu could be distributable if somebody bothers to contact qemu +# author http://fabrice.bellard.free.fr/qemu/qemu-accel.html # # Conditional build: -%bcond_with kqemu # with QEMU accelerator module +%bcond_without kqemu # disable QEMU accelerator support %bcond_with cflags_passing # with passing rpmcflags to Makefiles %bcond_with nosdlgui # do not use SDL gui (use X11 instead) +%bcond_with gcc4 # use gcc4 patches (broke build on gcc33) +%bcond_without dist_kernel # without distribution kernel +%bcond_with kernel # build kqemu kernel modules +%bcond_without smp # don't build SMP module +%bcond_without userspace # don't build userspace utilities # +%define _kqemu_version 1.3.0pre9 +%define _rel 0.4 Summary: QEMU CPU Emulator Summary(pl): QEMU - emulator procesora Name: qemu -Version: 0.7.1 -Release: 1 +Version: 0.8.2 +Release: %{_rel}%{?with_kqemu:k} 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: b0c80d2c082049a5b8ccbc7f55fe165b -%if %{with kqemu} -Source1: http://fabrice.bellard.free.fr/qemu/kqemu-0.7.1-1.tar.gz -# NoSource1-md5: 012498dac620eb8c212bf5f622414dd0 -NoSource: 1 -%endif +# Source0-md5: 5b3a89eb2f256a8a6f3bb07f7b3f1b07 +Source1: http://fabrice.bellard.free.fr/qemu/k%{name}-%{_kqemu_version}.tar.gz +# Source1-md5: 27888c3220844ad360a6a23345fa1bcb Patch0: %{name}-nostatic.patch -Patch1: %{name}-DESTDIR.patch +Patch1: %{name}-cc.patch Patch2: %{name}-longjmp.patch Patch3: %{name}-dot.patch -Patch4: %{name}-initrd_load_addr.patch -Patch5: %{name}-gcc4_x86.patch -Patch6: %{name}-gcc4_ppc.patch -Patch7: %{name}-parallel.patch -Patch8: %{name}-nosdlgui.patch +Patch4: %{name}-gcc4_x86.patch +Patch5: %{name}-gcc4_ppc.patch +Patch6: %{name}-nosdlgui.patch +Patch7: %{name}-ifup.patch URL: http://fabrice.bellard.free.fr/qemu/ -Requires: SDL >= 1.2.1 BuildRequires: SDL-devel >= 1.2.1 -BuildRequires: sed >= 4.0 -%if %{with kqemu} -BuildRequires: kernel-source +BuildRequires: alsa-lib-devel +%{!?with_gcc4:BuildRequires: gcc < 5:4.0} +%if %{with kqemu} && %{with dist_kernel} +BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7 %endif -ExclusiveArch: %{ix86} %{x8664} ppc +BuildRequires: perl-tools-pod +BuildRequires: rpmbuild(macros) >= 1.326 +BuildRequires: tetex +BuildRequires: sed >= 4.0 +Requires: SDL >= 1.2.1 # sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c) +ExclusiveArch: %{ix86} %{x8664} %{!?with_kqemu:ppc} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # some SPARC boot image in ELF format -%define _noautostrip .*%{_datadir}/qemu/proll.elf +%define _noautostrip .*%{_datadir}/qemu/openbios-sparc32 %description QEMU is a FAST! processor emulator. By using dynamic translation it @@ -56,9 +66,8 @@ CPUs. QEMU has two operating modes: emulation) and DOSEMU (DOS emulation) are the main targets for QEMU. - Full system emulation. In this mode, QEMU emulates a full system, - including a processor and various peripherials. - It can also be used to provide virtual hosting of several - virtual PC on a single server. + including a processor and various peripherials. It can also be used to + provide virtual hosting of several virtual PC on a single server. %description -l pl QEMU to szybki(!) emulator procesora. Poprzez u¿ycie dynamicznego @@ -67,105 +76,212 @@ aby dzia - Emulacja trybu u¿ytkownika. W tym trybie QEMU mo¿e uruchamiaæ procesy linuksowe skompilowane dla jednego procesora na innym - procesorze. Linuksowe wywo³ania systemowe s± t³umaczone ze wzglêdu - na niezgodno¶æ kolejno¶ci bajtów w s³owie i 32/64-bitowego rozmiaru + procesorze. Linuksowe wywo³ania systemowe s± t³umaczone ze wzglêdu na + niezgodno¶æ kolejno¶ci bajtów w s³owie i 32/64-bitowego rozmiaru s³owa. Wine (emulacja Windows) i DOSEMU (emulacja DOS-a) to g³ówne cele QEMU. - Pe³na emulacja systemu. W tym trybie QEMU emuluje ca³y system, - w³±czaj±c w to procesor i ró¿ne urz±dzenia peryferyjne. - Mo¿e byæ tak¿e u¿ywane do wirtualnego hostowania kilku wirtualnych - pecetów na pojedynczym serwerze. + w³±czaj±c w to procesor i ró¿ne urz±dzenia peryferyjne. Mo¿e byæ tak¿e + u¿ywane do wirtualnego hostowania kilku wirtualnych pecetów na + pojedynczym serwerze. + +%package -n kernel%{_alt_kernel}-misc-kqemu +Summary: kqemu - kernel module +Summary(pl): kqemu - modu³ j±dra +Version: %{_kqemu_version} +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +%{?with_dist_kernel:%requires_releq_kernel_up} +License: Free to use, non-distributable +Requires(post,postun): /sbin/depmod +Requires: module-init-tools >= 3.2.2-2 + +%description -n kernel%{_alt_kernel}-misc-kqemu +kqemu - kernel module. + +%description -n kernel%{_alt_kernel}-misc-kqemu -l pl +kqemu - modu³ j±dra. + +%package -n kernel%{_alt_kernel}-smp-misc-kqemu +Summary: kqemu - SMP kernel module +Summary(pl): kqemu - modu³ j±dra SMP +Version: %{_kqemu_version} +Release: %{_rel}@%{_kernel_ver_str} +Group: Base/Kernel +%{?with_dist_kernel:%requires_releq_kernel_smp} +License: Free to use, non-distributable +Requires(post,postun): /sbin/depmod +Requires: module-init-tools >= 3.2.2-2 + +%description -n kernel%{_alt_kernel}-smp-misc-kqemu +kqemu - SMP kernel module. + +%description -n kernel%{_alt_kernel}-smp-misc-kqemu -l pl +kqemu - modu³ j±dra SMP. %prep -%setup -q %{?with_kqemu:-a1} +%setup -q %{?with_kernel:-a1} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p0 -%patch6 -p1 +%if %{with gcc4} +%patch4 -p0 +%patch5 -p1 +%endif +%{?with_nosdlgui:%patch6 -p1} %patch7 -p1 -%{?with_nosdlgui:%patch8 -p1} %{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure +%{__sed} -i 's/.*MAKE) -C kqemu$//' Makefile # 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 +%else +%{__sed} -i 's/-Wall -O2 -g/-Wall -O2/' Makefile Makefile.target %endif -%{?with_kqemu:echo -n > kqemu/install.sh} +%if %{with kernel} +echo -n > kqemu-%{_kqemu_version}/install.sh + +cat <<'EOF' > modprobe.conf +# enable dynamic major +options kqemu major=0 +# for autoloading from static dev +#alias char-major-250 kqemu +EOF + +cat <<'EOF' > udev.conf +KERNEL=="kqemu", NAME="%k", MODE="0666" +EOF +%endif %build +%if %{with kernel} +cd kqemu-%{_kqemu_version} -%if %{with kqemu} -cp -rdp %{_kernelsrcdir}/ . -rm -f linux/.config -cp -f linux/config-smp linux/.config -make -C linux modules_prepare +mv -f kqemu-mod-i386.o{,.bin} +mv -f kqemu-mod-x86_64.o{,.bin} +mv -f kqemu-linux.c{,.orig} +cat > Makefile <<'EOF' +obj-m := kqemu.o +kqemu-objs:= kqemu-linux.o kqemu-mod.o + +$(obj)/kqemu-mod.o: $(src)/kqemu-mod-$(ARCH).o.bin + cp $< $@ +EOF + +%build_kernel_modules -m kqemu <<'EOF' +if grep -q "CONFIG_PREEMPT_RT" o/.config; then + sed 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(kqemu_lock)/' \ + kqemu-linux.c.orig > kqemu-linux.c +else + cat kqemu-linux.c.orig > kqemu-linux.c +fi +EOF +cd - %endif +%if %{with userspace} # --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}" \ - %if %{with kqemu} - --enable-kqemu }\ - --kernel-path=`pwd`/linux \ - %endif - --make="%{__make}" - -%{__make} - + --host-cc="%{__cc}" \ + --make="%{__make}" \ %if %{with kqemu} -mv kqemu/kqemu.ko kqemu/kqemu.smp -cp -f linux/config-up linux/.config -make -C linux modules_prepare + --kernel-path=%{_kernelsrcdir} \ +%else + --disable-kqemu \ +%endif + %{?with_gcc4:--disable-gcc-check} \ + --enable-alsa \ + --interp-prefix=%{_libdir}/%{name} +%{__make} %endif %install rm -rf $RPM_BUILD_ROOT +%if %{with userspace} %{__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 +install -d $RPM_BUILD_ROOT/sbin +cat <<'EOF' > $RPM_BUILD_ROOT/sbin/qemu-ifup +#!/bin/sh +if [ -f /etc/sysconfig/qemu ]; then + . /etc/sysconfig/qemu +fi +# of course this will work only for one interface. a lot possible to involve +sudo /sbin/ifconfig $1 ${INTERFACE_ADDR:-172.20.0.1} +EOF %endif -# This dir is unneeded -rm -rf $RPM_BUILD_ROOT/usr/share/doc/qemu +%if %{with kernel} +%install_kernel_modules -m kqemu-%{_kqemu_version}/kqemu -d misc +install -d $RPM_BUILD_ROOT/etc/{modprobe.d/%{_kernel_ver}{,smp},udev/rules.d} +install modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/kqemu.conf +%if %{with smp} && %{with dist_kernel} +install modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}smp/kqemu.conf +%endif +install udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/kqemu.rules +%endif + +# already packaged +rm -rf $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-{doc,tech}.html %clean rm -rf $RPM_BUILD_ROOT +%if %{with kernel} %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: +%banner %{name} -e <