X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Fqemu.git;a=blobdiff_plain;f=qemu.spec;h=2181bec5e4ee77ca2f3264d3daa30364aabe4868;hp=ebf570c8e7b017192c9e3ce21f11fd9f025e021d;hb=d90027067df523cf21065ecf75ec8ea2bc715cf6;hpb=ebc199701eded52448efd26ee86e5cabd6ed1f04 diff --git a/qemu.spec b/qemu.spec index ebf570c..2181bec 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,87 +1,68 @@ -# # TODO: -# - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed. +# - package virtfs-proxy-helper, qemu-bridge-helper. +# - package qemu-system-or32 +# - update patches +# - qemu-system-ppc -hda ac-ppc.img says: +# qemu: could not open disk image ac-ppc.img: error "Success" +# qemu-0.12.2-2.x86_64.rpm - broken +# qemu-0.12.3-3.x86_64/qemu-0.12.4-1.x86_64 - stops on "returning from prom_init" +# qemu-0.15.0-2.x86_64.rpm - qemu-system-sparc/ppc booting with -kernel, -initrd options stalls in openbios prompt +# qemu-0.11.1-*.x86_64.rpm - OK # # Conditional build: -%bcond_without kqemu # disable KQEMU ACCELERATOR support in QEMU -%bcond_with cflags_passing # with passing rpmcflags to Makefiles -%bcond_with dosguest # add special patch when use with DOS as guest os %bcond_with nosdlgui # do not use SDL gui (use X11 instead) -# Note that gcc4 build is very problematic and not supported by qemu team -%bcond_without gcc4 # use gcc4 patches (broke build on gcc33) -%bcond_without dist_kernel # without distribution kernel -%bcond_without kernel # build kqemu KERNEL MODULES -%bcond_without userspace # don't build userspace -%bcond_with grsec_kernel # build for kernel-grsecurity - -%if %{without kernel} -%undefine with_dist_kernel -%endif -%if %{with dist_kernel} && %{with grsec_kernel} -%define alt_kernel grsecurity -%endif - -# no kernel kqemu module for ppc -%ifarch ppc -%undefine with_kqemu -%undefine with_kernel -%endif - -%if "%{_alt_kernel}" != "%{nil}" -%undefine with_userspace -%endif - -%define kqemu_version 1.3.0pre11 -%define qemu_version 0.9.1 -%define pname qemu - -%define rel 6 + Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora -Name: %{pname}%{_alt_kernel} -Version: %{qemu_version} -Release: %{rel}%{?with_kqemu:k} +Name: qemu +Version: 1.2.0 +Release: 1 License: GPL Group: Applications/Emulators -#Source0Download: http://fabrice.bellard.free.fr/qemu/download.html -Source0: http://fabrice.bellard.free.fr/qemu/%{pname}-%{version}.tar.gz -# Source0-md5: 6591df8e9270eb358c881de4ebea1262 -Source1: http://fabrice.bellard.free.fr/qemu/k%{pname}-%{kqemu_version}.tar.gz -# Source1-md5: 970521874ef8b1ba4598925ace5936c3 -Patch0: %{pname}-nostatic.patch -Patch1: %{pname}-cc.patch -Patch3: %{pname}-dot.patch -Patch4: %{pname}-gcc4_x86.patch -Patch5: %{pname}-gcc4_ppc.patch -Patch6: %{pname}-nosdlgui.patch +Source0: http://wiki.qemu.org/download/%{name}-%{version}.tar.bz2 +# Source0-md5: 78eb1e984f4532aa9f2bdd3c127b5b61 +Patch0: %{name}-cflags.patch +Patch1: vgabios-widescreens.patch +Patch6: %{name}-nosdlgui.patch # Proof of concept, for reference, do not remove -Patch8: %{pname}-kde_virtual_workspaces_hack.patch -# http://gwenole.beauchesne.info/en/projects/qemu -Patch9: %{pname}-0.8.0-gcc4-hacks.patch -Patch11: %{pname}-0.7.2-gcc4-opts.patch -#Patch12: %{pname}-0.7.2-dyngen-check-stack-clobbers.patch -Patch13: %{pname}-dosguest.patch -URL: http://fabrice.bellard.free.fr/qemu/ -%if %{with kernel} && %{with dist_kernel} -BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7 -BuildRequires: rpmbuild(macros) >= 1.379 -%endif -%if %{with userspace} +Patch8: %{name}-kde_virtual_workspaces_hack.patch +Patch17: %{name}-whitelist.patch +URL: http://wiki.qemu.org/Index.html BuildRequires: SDL-devel >= 1.2.1 BuildRequires: alsa-lib-devel -%{!?with_gcc4:BuildRequires: gcc < 5:4.0} +BuildRequires: bluez-libs-devel +BuildRequires: gnutls-devel +BuildRequires: ncurses-devel +BuildRequires: perl-Encode BuildRequires: perl-tools-pod +BuildRequires: pkgconfig BuildRequires: sed >= 4.0 -BuildRequires: tetex +BuildRequires: texi2html +BuildRequires: texinfo BuildRequires: which -%endif -Requires: SDL >= 1.2.1 +BuildRequires: xen-devel +BuildRequires: xorg-lib-libX11-devel +Requires: %{name}-img = %{version}-%{release} +Requires: %{name}-system-alpha = %{version}-%{release} +Requires: %{name}-system-arm = %{version}-%{release} +Requires: %{name}-system-cris = %{version}-%{release} +Requires: %{name}-system-lm32 = %{version}-%{release} +Requires: %{name}-system-m68k = %{version}-%{release} +Requires: %{name}-system-microblaze = %{version}-%{release} +Requires: %{name}-system-mips = %{version}-%{release} +Requires: %{name}-system-ppc = %{version}-%{release} +Requires: %{name}-system-s390x = %{version}-%{release} +Requires: %{name}-system-sh4 = %{version}-%{release} +Requires: %{name}-system-sparc = %{version}-%{release} +Requires: %{name}-system-x86 = %{version}-%{release} +Requires: %{name}-system-xtensa = %{version}-%{release} +Requires: %{name}-user = %{version}-%{release} # sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c) ExclusiveArch: %{ix86} %{x8664} %{?with_userspace:ppc} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -# some SPARC boot image in ELF format -%define _noautostrip .*%{_datadir}/qemu/openbios-sparc32 +# some PPC/SPARC boot image in ELF format +%define _noautostrip .*%{_datadir}/qemu/.*-.* %description QEMU is a FAST! processor emulator. By using dynamic translation it @@ -114,127 +95,213 @@ aby działał na kolejnych procesorach. QEMU ma dwa tryby pracy: 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.UTF-8): kqemu - moduł jądra -Version: %{kqemu_version} -Release: %{rel}@%{_kernel_ver_str} -Group: Base/Kernel -%{?with_dist_kernel:%requires_releq_kernel} -License: GPL v2 -Obsoletes: kernel%{_alt_kernel}-smp-misc-kqemu -Requires(post,postun): /sbin/depmod -Requires: module-init-tools >= 3.2.2-2 +%package common +Summary: QEMU common files needed by all QEMU targets +Group: Development/Tools +Requires: SDL >= 1.2.1 +Conflicts: qemu < 1.0-2 + +%description common +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the common files needed by all QEMU targets. + +%package img +Summary: QEMU command line tool for manipulating disk images +Group: Development/Tools +Conflicts: qemu < 1.0-2 + +%description img +This package provides a command line tool for manipulating disk images + +%package user +Summary: QEMU user mode emulation of qemu targets +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description user +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the user mode emulation of QEMU targets. + +%package system-alpha +Summary: QEMU system emulator for alpha +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-alpha +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for alpha. + +%package system-arm +Summary: QEMU system emulator for arm +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-arm +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for arm. + +%package system-cris +Summary: QEMU system emulator for cris +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-cris +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for cris. + +%package system-lm32 +Summary: QEMU system emulator for lm32 +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-lm32 +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for lm32. + +%package system-m68k +Summary: QEMU system emulator for m68k +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-m68k +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for m68k. + +%package system-microblaze +Summary: QEMU system emulator for microblaze +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-microblaze +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for microblaze. + +%package system-mips +Summary: QEMU system emulator for mips +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-mips +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for mips. + +%package system-ppc +Summary: QEMU system emulator for ppc +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-ppc +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for ppc. + +%package system-s390x +Summary: QEMU system emulator for s390x +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-s390x +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for s390x. + +%package system-sh4 +Summary: QEMU system emulator for sh4 +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-sh4 +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for sh4. + +%package system-sparc +Summary: QEMU system emulator for sparc +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-sparc +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for sparc/sparc64. + +%package system-x86 +Summary: QEMU system emulator for x86 +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} -%description -n kernel%{_alt_kernel}-misc-kqemu -kqemu - kernel module. +%description system-x86 +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. -%description -n kernel%{_alt_kernel}-misc-kqemu -l pl.UTF-8 -kqemu - moduł jądra. +This package provides the system emulator for x86. When being run in a +x86 machine that supports it, this package also provides the KVM +virtualization platform. + +%package system-xtensa +Summary: QEMU system emulator for xtensa +Group: Development/Tools +Requires: %{name}-common = %{version}-%{release} + +%description system-xtensa +QEMU is a generic and open source processor emulator which achieves a +good emulation speed by using dynamic translation. + +This package provides the system emulator for xtensa. %prep -%setup -q -n %{pname}-%{qemu_version} %{?with_kernel:-a1} +%setup -q %patch0 -p1 %patch1 -p1 -%patch3 -p1 -%if %{with gcc4} -%patch9 -p1 -%patch11 -p1 -#%patch12 -p1 -#%patch4 -p0 -%patch5 -p1 -%endif %{?with_nosdlgui:%patch6 -p1} -#%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 - -%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 +#patch8 -p1 +%patch17 -p0 -cd kqemu-%{kqemu_version} -%{__sed} -i 's#include ../config-host.mak##' ./common/Makefile -%ifarch %{x8664} -%{__sed} -i 's/^#ARCH=x86_64/ARCH=x86_64/' ./common/Makefile -%{__make} -j1 -C common -mv -f kqemu-mod-x86_64.o{,.bin} -%else -%{__sed} -i 's/^#ARCH=i386/ARCH=i386/' ./common/Makefile -%{__make} -j1 -C common -mv -f kqemu-mod-i386.o{,.bin} -%endif - -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 -cd - -%endif - -%if %{with dosguest} -%patch13 -p1 -%endif +# workaround for conflict with alsa/error.h +ln -s ../error.h qapi/error.h %build -%if %{with kernel} -cd kqemu-%{kqemu_version} -%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 \ + --extra-cflags="%{rpmcflags} -I/usr/include/ncurses" \ + --extra-ldflags="%{rpmldflags}" \ + --disable-strip \ + --sysconfdir=%{_sysconfdir} \ --prefix=%{_prefix} \ --cc="%{__cc}" \ --host-cc="%{__cc}" \ - --make="%{__make}" \ -%if %{with kqemu} - --kernel-path=%{_kernelsrcdir} \ -%else - --disable-kqemu \ -%endif - %{?with_gcc4:--disable-gcc-check} \ - --enable-alsa \ - --interp-prefix=%{_libdir}/%{pname} -%{__make} -%endif + --enable-mixemu \ + --audio-drv-list="alsa" \ + --interp-prefix=%{_libdir}/%{name} +%{__make} V=1 + +# rebuild patched vesa tables with additional widescreen modes. +%{__make} -C roms/vgabios stdvga-bios %install rm -rf $RPM_BUILD_ROOT -%if %{with userspace} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -243,51 +310,129 @@ cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/qemu-ifup #!/bin/sh EOF -%endif - -%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 -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 +# install patched vesa tables with additional widescreen modes. +install -m 644 roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin $RPM_BUILD_ROOT%{_datadir}/%{name}/vgabios-stdvga.bin + %clean rm -rf $RPM_BUILD_ROOT -%if %{with kernel} -%post -%banner %{pname} -e <