X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=qemu.spec;h=edc7e4ec501e34975993df2e9f096fbf92e9c18e;hb=409927c34b3e75fadfcf96a5eeeeb2c4001f0081;hp=f14defd3d9589400716ae18213af2c270551d25b;hpb=c1e4b9fd1050e1331f820adb5a7029ac10360cc2;p=packages%2Fqemu.git diff --git a/qemu.spec b/qemu.spec index f14defd..edc7e4e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,65 +1,88 @@ # # TODO: -# - wait till the gcc bug http://gcc.gnu.org/PR16185 is fixed. +# - update patches # # 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_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 smp # don't build SMP module %bcond_without userspace # don't build userspace utilities -# -%define _kqemu_version 1.3.0pre11 -%define _rel 1 + +# no kernel kqemu module for ppc +%ifarch ppc +%undefine with_kqemu +%undefine with_kernel +%endif + +%if %{without kernel} +%undefine with_dist_kernel +%endif +%if "%{_alt_kernel}" != "%{nil}" +%undefine with_userspace +%endif +%if %{without userspace} +# nothing to be placed to debuginfo package +%define _enable_debug_packages 0 +%endif + +%define rel 3 + +%define kqemu_version 1.4.0pre1 +%define qemu_version 0.11.1 +%define pname qemu 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 -# 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 -Patch7: %{name}-ifup.patch +# Source0Download: http://fabrice.bellard.free.fr/qemu/download.html +Source0: http://download.savannah.gnu.org/releases/qemu/%{pname}-%{version}.tar.gz +# Source0-md5: 193285b0bcf655a7f7577d05ffcb82b1 +Source1: http://www.nongnu.org/qemu/k%{pname}-%{kqemu_version}.tar.gz +# Source1-md5: d738d8ca7332211ab716ec3213d82ee1 +Patch0: %{pname}-ncurses.patch +Patch6: %{pname}-nosdlgui.patch # Proof of concept, for reference, do not remove -Patch8: %{name}-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 -URL: http://fabrice.bellard.free.fr/qemu/ +Patch8: %{pname}-kde_virtual_workspaces_hack.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 +URL: http://www.nongnu.org/qemu/ %if %{with kernel} && %{with dist_kernel} BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7 -BuildRequires: rpmbuild(macros) >= 1.330 +BuildRequires: rpmbuild(macros) >= 1.379 %endif %if %{with userspace} 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: tetex +BuildRequires: pkgconfig BuildRequires: sed >= 4.0 +BuildRequires: texi2html +BuildRequires: texinfo-texi2dvi +BuildRequires: which +BuildRequires: xorg-lib-libX11-devel %endif Requires: SDL >= 1.2.1 # sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c) -ExclusiveArch: %{ix86} %{x8664} %{!?with_kqemu:ppc} +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/openbios-.* %description QEMU is a FAST! processor emulator. By using dynamic translation it @@ -95,11 +118,12 @@ 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_up} +%{?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 @@ -109,37 +133,10 @@ kqemu - kernel module. %description -n kernel%{_alt_kernel}-misc-kqemu -l pl.UTF-8 kqemu - moduł jądra. -%package -n kernel%{_alt_kernel}-smp-misc-kqemu -Summary: kqemu - SMP kernel module -Summary(pl.UTF-8): kqemu - moduł jądra SMP -Version: %{_kqemu_version} -Release: %{_rel}@%{_kernel_ver_str} -Group: Base/Kernel -%{?with_dist_kernel:%requires_releq_kernel_smp} -License: GPL v2 -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.UTF-8 -kqemu - moduł jądra SMP. - %prep -%setup -q %{?with_kernel:-a1} -%patch0 -p1 -%patch1 -p1 -%patch3 -p1 -%if %{with gcc4} -%patch9 -p1 -%patch11 -p1 -#%patch12 -p1 -#%patch4 -p0 -%patch5 -p1 -%endif +%setup -q -n %{pname}-%{qemu_version} %{?with_kernel:-a1} +%patch0 -p0 %{?with_nosdlgui:%patch6 -p1} -%patch7 -p1 #%patch8 -p1 %{__sed} -i -e 's/sdl_static=yes/sdl_static=no/' configure @@ -153,7 +150,7 @@ kqemu - moduł jądra SMP. %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 @@ -165,20 +162,23 @@ EOF cat <<'EOF' > udev.conf KERNEL=="kqemu", NAME="%k", MODE="0666" EOF -%endif -%build -%if %{with kernel} -cd kqemu-%{_kqemu_version} +%if %{with dosguest} +%patch13 -p1 +%endif +%patch14 -p1 +#%patch15 -p1 +%patch16 -p1 +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} -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} -C common +%{__make} -C common -j1 mv -f kqemu-mod-i386.o{,.bin} %endif @@ -190,7 +190,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)/' \ @@ -210,14 +215,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} + --enable-mixemu \ + --audio-drv-list="alsa" \ + --interp-prefix=%{_libdir}/%{pname} %{__make} %endif @@ -228,24 +231,17 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/sbin -cat <<'EOF' > $RPM_BUILD_ROOT/sbin/qemu-ifup +install -d $RPM_BUILD_ROOT%{_sysconfdir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/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 %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 -%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 @@ -257,7 +253,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with kernel} %post -%banner %{name} -e <