SPECS: VMware-workstation.spec - preempt-rt hack is back

[sparky]

Author: sparky                       Date: Tue Nov 14 22:20:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- preempt-rt hack is back

---- Files affected:
SPECS:
   VMware-workstation.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.100 SPECS/VMware-workstation.spec:1.101
--- SPECS/VMware-workstation.spec:1.100	Tue Nov 14 23:13:41 2006
+++ SPECS/VMware-workstation.spec	Tue Nov 14 23:20:21 2006
@@ -314,23 +314,33 @@
 
 %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
-%if 0
-	if grep -q "^CONFIG_PREEMPT_RT=y$" o/.config; then
-		sed -e '/pollQueueLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(pollQueueLock)/' \
-			-e '/timerLock/s/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(timerLock)/' \
-			-i ../vmmon-only/linux/driver.c
-		sed -e 's/SPIN_LOCK_UNLOCKED/SPIN_LOCK_UNLOCKED(vnetHubLock)/' \
-			-i ../vmnet-only/hub.c
-		sed -e 's/RW_LOCK_UNLOCKED/RW_LOCK_UNLOCKED(vnetPeerLock)/' \
-			-i ../vmnet-only/driver.c
-	fi
-%endif
 
 %else
 for mod in vmmon vmnet ; do
@@ -631,6 +641,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2006/11/14 22:20:21  sparky
+- preempt-rt hack is back
+
 Revision 1.100  2006/11/14 22:13:41  sparky
 - now builds fine, 'rm -f */*.o *.o' is not required, but better use is
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.100&r2=1.101&f=u