Author: glen Date: Sat May 20 00:42:21 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - always enable kqemu support, it's kqemu module that's restricted, not base - /dev/kqemu dropped from base, should be in kernel pkg, but major unlikely matches (just use udev)
---- Files affected: SPECS: qemu.spec (1.51 -> 1.52) ---- Diffs: ================================================================ Index: SPECS/qemu.spec diff -u SPECS/qemu.spec:1.51 SPECS/qemu.spec:1.52 --- SPECS/qemu.spec:1.51 Sat May 20 01:13:37 2006 +++ SPECS/qemu.spec Sat May 20 02:42:16 2006 @@ -6,21 +6,21 @@ # 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_without kernel # don't build kernel modules +%bcond_with kernel # build kqemu kernel modules %bcond_without smp # don't build SMP module %bcond_without userspace # don't build userspace utilities -# -%if %{without kqemu} -%undefine with_kernel + +%if %{with dist_kernel} +%define with_kernel 1 %endif # %define _kqemu_version 1.3.0pre7 -%define _rel 0.2 +%define _rel 0.4 Summary: QEMU CPU Emulator Summary(pl): QEMU - emulator procesora Name: qemu @@ -129,7 +129,7 @@ kqemu - moduł jądra SMP. %prep -%setup -q %{?with_kqemu:-a1} +%setup -q %{?with_kernel:-a1} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -155,7 +155,7 @@ %{__sed} -i 's/-Wall -O2 -g/-Wall -O2/' Makefile Makefile.target %endif -%if %{with kqemu} +%if %{with kernel} echo -n > kqemu-%{_kqemu_version}/install.sh cat <<'EOF' > modprobe.conf @@ -256,7 +256,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%if %{with kqemu} +%if %{with kernel} %post %banner %{name} -e <<EOF To enable qemu accelerator (kqemu), the kqemu kernel module must be loaded: @@ -285,10 +285,6 @@ %{_datadir}/qemu %{_mandir}/man1/qemu.1* %{_mandir}/man1/qemu-img.1* -# FIXME: maybe better moved this into dev.spec -%if %{with kqemu} -%dev(c,250,0) %attr(666,root,root) /dev/kqemu -%endif %endif %if %{with kernel} @@ -315,6 +311,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.52 2006/05/20 00:42:16 glen +- always enable kqemu support, it's kqemu module that's restricted, not base +- /dev/kqemu dropped from base, should be in kernel pkg, but major unlikely matches (just use udev) + Revision 1.51 2006/05/19 23:13:37 glen - updated to 0.8.1 - dropped DESTDIR,initrd_load_addr,slirp_throttle (applied upstream) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.51&r2=1.52&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
