X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=qemu.spec;h=8f46f52a2b5a868ba94d2803daee9ed3a6cc6478;hb=39b50bf08739bf56af3b00de17f7e9f958671ba1;hp=3a3986a6d0b896b765e76066458962f41e6d26db;hpb=080a0c6f739c60b821f80248879bc5c6c90d8c8a;p=packages%2Fqemu.git diff --git a/qemu.spec b/qemu.spec index 3a3986a..8f46f52 100644 --- a/qemu.spec +++ b/qemu.spec @@ -6,22 +6,31 @@ %bcond_with kqemu # with QEMU accelerator module %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_without kernel # don't build kernel modules +%bcond_without smp # don't build SMP module +%bcond_without userspace # don't build userspace utilities # +%if %{without kqemu} +%undefine with_kernel +%endif +# +%define _kqemu_version 1.3.0pre7 +%define _rel 1.2 Summary: QEMU CPU Emulator Summary(pl): QEMU - emulator procesora Name: qemu -Version: 0.7.1 -Release: 1 +Version: 0.8.0 +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 +# Source0-md5: eb175b26583280706fe7e4d8910d320d +Source1: http://fabrice.bellard.free.fr/qemu/kqemu-%{_kqemu_version}.tar.gz +# NoSource1-md5: 3b77edbada790f924456aa4675edd0be NoSource: 1 -%endif Patch0: %{name}-nostatic.patch Patch1: %{name}-DESTDIR.patch Patch2: %{name}-longjmp.patch @@ -31,15 +40,21 @@ Patch5: %{name}-gcc4_x86.patch Patch6: %{name}-gcc4_ppc.patch Patch7: %{name}-parallel.patch Patch8: %{name}-nosdlgui.patch +Patch9: %{name}-ifup.patch +Patch10: %{name}-gcc33.patch +Patch11: %{name}-slirp_throttle.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-module-build >= 3:2.6.7 %endif -ExclusiveArch: %{ix86} %{x8664} ppc +BuildRequires: rpmbuild(macros) >= 1.217 +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 @@ -56,9 +71,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,15 +81,49 @@ 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-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-misc-kqemu +kqemu - kernel module. + +%description -n kernel-misc-kqemu -l pl +kqemu - modu³ j±dra. + +%package -n 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_up} +License: Free to use, non-distributable +Requires(post,postun): /sbin/depmod +Requires: module-init-tools >= 3.2.2-2 + +%description -n kernel-smp-misc-kqemu +kqemu - SMP kernel module. + +%description -n kernel-smp-misc-kqemu -l pl +kqemu - modu³ j±dra SMP. %prep %setup -q %{?with_kqemu:-a1} @@ -84,88 +132,158 @@ aby dzia %patch2 -p1 %patch3 -p1 %patch4 -p1 +%if %{with gcc4} %patch5 -p0 %patch6 -p1 -%patch7 -p1 +%endif +# probably not needed +# %patch7 -p1 %{?with_nosdlgui:%patch8 -p1} +%patch9 -p1 +%patch10 -p1 +%patch11 -p0 %{__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 kqemu} +echo -n > kqemu-%{_kqemu_version}/install.sh +%endif %build +%if %{with kernel} +cd kqemu-%{_kqemu_version} +mv -f kqemu-linux.c{,.orig} +for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do + if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then + exit 1 + fi + install -d o/include/linux + ln -sf %{_kernelsrcdir}/config-$cfg o/.config + ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers + ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h +%if %{with dist_kernel} + %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts +%else + install -d o/include/config + touch o/include/config/MARKER + ln -sf %{_kernelsrcdir}/scripts o/scripts +%endif + if grep -q "^CONFIG_PREEMPT_RT=y$" 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 -%if %{with kqemu} -cp -rdp %{_kernelsrcdir}/ . -rm -f linux/.config -cp -f linux/config-smp linux/.config -make -C linux modules_prepare + %{__make} -C %{_kernelsrcdir} modules \ + CC="%{__cc}" CPP="%{__cpp}" \ + M=$PWD O=$PWD/o \ + %{?with_verbose:V=1} + mv kqemu.ko kqemu-mod-$cfg.ko +done +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} - -%if %{with kqemu} -mv kqemu/kqemu.ko kqemu/kqemu.smp -cp -f linux/config-up linux/.config -make -C linux modules_prepare + %{?with_gcc4:--disable-gcc-check} \ + %{!?with_kqemu:--disable-kqemu} \ + --enable-alsa \ + --make="%{__make}" \ + --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 -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc +install kqemu-%{_kqemu_version}/kqemu-mod-up.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/kqemu.ko +%if %{with smp} && %{with dist_kernel} +install kqemu-%{_kqemu_version}/kqemu-mod-smp.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/kqemu.ko +%endif +install -d $RPM_BUILD_ROOT/etc/modprobe.d +echo 'alias char-major-250 kqemu' > $RPM_BUILD_ROOT/etc/modprobe.d/kqemu.conf +%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: +%post +%banner %{name} -e <