Author: sparky Date: Wed Feb 22 23:37:49 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed build with PREEMPT_RT
- no kqemu on ppc
---- Files affected:
SPECS:
qemu.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.46 SPECS/qemu.spec:1.47
--- SPECS/qemu.spec:1.46 Thu Feb 23 00:27:12 2006
+++ SPECS/qemu.spec Thu Feb 23 00:37:43 2006
@@ -53,7 +53,7 @@
BuildRequires: rpmbuild(macros) >= 1.217
BuildRequires: sed >= 4.0
Requires: SDL >= 1.2.1
-ExclusiveArch: %{ix86} %{x8664} ppc
+ExclusiveArch: %{ix86} %{x8664} %{!?with_kqemu:ppc}
# sparc is currently unsupported (missing cpu_get_real_ticks() impl in vl.c)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -161,6 +161,7 @@
%build
%if %{with kernel}
cd kqemu
+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
@@ -176,6 +177,13 @@
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
+
%{__make} -C %{_kernelsrcdir} modules \
CC="%{__cc}" CPP="%{__cpp}" \
M=$PWD O=$PWD/o \
@@ -294,6 +302,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2006/02/22 23:37:43 sparky
+- fixed build with PREEMPT_RT
+- no kqemu on ppc
+
Revision 1.46 2006/02/22 23:27:12 sparky
- fixed new way module building
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qemu.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
