SPECS: VMware-workstation.spec - d'oh, in 2.6.17+ PREEMPT_RT spinl...
sparky
sparky at pld-linux.org
Tue Nov 14 23:38:36 CET 2006
Author: sparky Date: Tue Nov 14 22:38:36 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- d'oh, in 2.6.17+ PREEMPT_RT spinlocks are defined standatd way, hack removed
---- Files affected:
SPECS:
VMware-workstation.spec (1.101 -> 1.102)
---- Diffs:
================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.101 SPECS/VMware-workstation.spec:1.102
--- SPECS/VMware-workstation.spec:1.101 Tue Nov 14 23:20:21 2006
+++ SPECS/VMware-workstation.spec Tue Nov 14 23:38:30 2006
@@ -315,31 +315,11 @@
%if !%{with kernel24}
%define ModuleBuildArgs VMWARE_VER=VME_V5 SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{_ccver}
-cp vmmon-only/linux/driver.c{,.orig}
%build_kernel_modules -c -C vmmon-only -m vmmon %{ModuleBuildArgs} <<'EOF'
rm -f */*.o *.o
-if grep -q "CONFIG_PREEMPT_RT" o/.config; then
- sed -e '/pollQueueLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(pollQueueLock)/' \
- -e '/timerLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(timerLock)/' \
- linux/driver.c.orig > linux/driver.c
-else
- cat linux/driver.c.orig > linux/driver.c
-fi
EOF
-
-cp vmnet-only/hub.c{,.orig}
-cp vmnet-only/driver.c{,.orig}
%build_kernel_modules -c -C vmnet-only -m vmnet %{ModuleBuildArgs} <<'EOF'
rm -f *.o
-if grep -q "CONFIG_PREEMPT_RT" o/.config; then
- sed -e 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(vnetHubLock)/' \
- hub.c.orig > hub.c
- sed -e 's/RW_LOCK_UNLOCKED/RW_LOCK_UNLOCKED(vnetPeerLock)/' \
- driver.c.orig > driver.c
-else
- cat hub.c.orig > hub.c
- cat driver.c.orig > driver.c
-fi
EOF
%else
@@ -641,6 +621,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.102 2006/11/14 22:38:30 sparky
+- d'oh, in 2.6.17+ PREEMPT_RT spinlocks are defined standatd way, hack removed
+
Revision 1.101 2006/11/14 22:20:21 sparky
- preempt-rt hack is back
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.101&r2=1.102&f=u
More information about the pld-cvs-commit
mailing list