X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=qemu.spec;h=5c9b597cf482d881a11e722b3e5e12f4487bf4e0;hb=274003840b4888a4e27a2dd223a224b85d3eabaf;hp=e02f54515f0bbdb94c87d97c43ebb137c3e1368d;hpb=700ff264278e8ba23cd623ce15981274255aa4a8;p=packages%2Fqemu.git diff --git a/qemu.spec b/qemu.spec index e02f545..5c9b597 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,7 @@ # # TODO: # - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed. +# - update or drop gcc4 bcond patches # # Conditional build: %bcond_without kqemu # disable KQEMU ACCELERATOR support in QEMU @@ -8,48 +9,62 @@ %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_with 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 %{with kernel} && %{with dist_kernel} && %{with grsec_kernel} -%define alt_kernel grsecurity +%bcond_without userspace # don't build userspace utilities + +%if %{without kernel} +%undefine with_dist_kernel %endif -# no kqemu for ppc +# no kernel kqemu module for ppc %ifarch ppc -%undefine with_kqemu -%undefine with_kernel +%undefine with_kqemu +%undefine with_kernel %endif -%define _kqemu_version 1.3.0pre11 -%define _rel 2 + +%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 9 Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora -Name: qemu -Version: 0.9.0 -Release: %{_rel}%{?with_kqemu:k} +Name: %{pname}%{_alt_kernel} +Version: %{qemu_version} +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: ab11a03ba30cf4a70641f0f170473d69 -Source1: http://fabrice.bellard.free.fr/qemu/k%{name}-%{_kqemu_version}.tar.gz +# 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: %{name}-nostatic.patch -Patch1: %{name}-cc.patch -Patch3: %{name}-dot.patch -Patch4: %{name}-gcc4_x86.patch -Patch5: %{name}-gcc4_ppc.patch -Patch6: %{name}-nosdlgui.patch +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 # Proof of concept, for reference, do not remove -Patch8: %{name}-kde_virtual_workspaces_hack.patch +Patch8: %{pname}-kde_virtual_workspaces_hack.patch # http://gwenole.beauchesne.info/en/projects/qemu -Patch9: %{name}-0.8.0-gcc4-hacks.patch -Patch11: %{name}-0.7.2-gcc4-opts.patch -#Patch12: %{name}-0.7.2-dyngen-check-stack-clobbers.patch -Patch13: %{name}-dosguest.patch +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 +Patch14: %{pname}-ppc_old_binutils.patch +Patch15: %{pname}-isa-bios-ram.patch +# below one fixes problems with passing ram size to bios/bootloader +# which affects coreboot/linuxbios +Patch16: %{pname}-piix-ram-size.patch +Patch17: %{pname}-CVE-2008-0928.patch +Patch18: %{pname}-CVE-2008-2004.patch URL: http://fabrice.bellard.free.fr/qemu/ %if %{with kernel} && %{with dist_kernel} BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7 @@ -60,12 +75,13 @@ BuildRequires: SDL-devel >= 1.2.1 BuildRequires: alsa-lib-devel %{!?with_gcc4:BuildRequires: gcc < 5:4.0} BuildRequires: perl-tools-pod -BuildRequires: tetex BuildRequires: sed >= 4.0 +BuildRequires: tetex +BuildRequires: which %endif Requires: SDL >= 1.2.1 # sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c) -ExclusiveArch: %{ix86} %{x8664} ppc +ExclusiveArch: %{ix86} %{x8664} %{?with_userspace:ppc} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # some SPARC boot image in ELF format @@ -105,8 +121,8 @@ aby działał na kolejnych procesorach. QEMU ma dwa tryby pracy: %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} +Version: %{kqemu_version} +Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel %{?with_dist_kernel:%requires_releq_kernel} License: GPL v2 @@ -121,12 +137,7 @@ kqemu - kernel module. kqemu - moduł jądra. %prep -%if %{without kernel} && %{without dist_kernel} -%{error:%{name}: If building kernel module You need to enable at least one of up or smp} -exit 1 -%endif - -%setup -q %{?with_kernel:-a1} +%setup -q -n %{pname}-%{qemu_version} %{?with_kernel:-a1} %patch0 -p1 %patch1 -p1 %patch3 -p1 @@ -151,7 +162,7 @@ exit 1 %endif %if %{with kernel} -echo -n > kqemu-%{_kqemu_version}/install.sh +echo -n > kqemu-%{kqemu_version}/install.sh cat <<'EOF' > modprobe.conf # enable dynamic major @@ -163,24 +174,25 @@ EOF cat <<'EOF' > udev.conf KERNEL=="kqemu", NAME="%k", MODE="0666" EOF -%endif %if %{with dosguest} %patch13 -p1 %endif +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p2 +%patch18 -p0 -%build -%if %{with kernel} -cd kqemu-%{_kqemu_version} - +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 +%{__make} -C common -j1 mv -f kqemu-mod-x86_64.o{,.bin} %else %{__sed} -i 's/^#ARCH=i386/ARCH=i386/' ./common/Makefile -%{__make} -j1 -C common +%{__make} -C common -j1 mv -f kqemu-mod-i386.o{,.bin} %endif @@ -192,7 +204,12 @@ kqemu-objs:= kqemu-linux.o kqemu-mod.o $(obj)/kqemu-mod.o: $(src)/kqemu-mod-$(ARCH).o.bin cp $< $@ EOF +cd - +%endif +%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)/' \ @@ -212,14 +229,12 @@ cd - --cc="%{__cc}" \ --host-cc="%{__cc}" \ --make="%{__make}" \ -%if %{with kqemu} - --kernel-path=%{_kernelsrcdir} \ -%else +%if %{without kqemu} --disable-kqemu \ %endif %{?with_gcc4:--disable-gcc-check} \ --enable-alsa \ - --interp-prefix=%{_libdir}/%{name} + --interp-prefix=%{_libdir}/%{pname} %{__make} %endif @@ -238,7 +253,7 @@ EOF %endif %if %{with kernel} -%install_kernel_modules -m kqemu-%{_kqemu_version}/kqemu -d misc +%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 @@ -252,7 +267,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with kernel} %post -%banner %{name} -e <