SPECS: VMware-server.spec - build 22874 - any-any-update 101 - rel...

tommat tommat at pld-linux.org
Sun Apr 30 10:39:18 CEST 2006


Author: tommat                       Date: Sun Apr 30 08:39:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build 22874
- any-any-update 101
- rel 0.1
- new kernel module build way taken from VMware-workstation

---- Files affected:
SPECS:
   VMware-server.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.5 SPECS/VMware-server.spec:1.6
--- SPECS/VMware-server.spec:1.5	Thu Apr 20 19:56:49 2006
+++ SPECS/VMware-server.spec	Sun Apr 30 10:39:13 2006
@@ -31,9 +31,10 @@
 %endif
 #
 %define		_ver	e.x.p
-%define		_build	20925
-%define		_rel	1
-%define		_urel	98
+%define		_build	22874
+%define		_rel	0.1
+%define		_urel	101
+%define		_ccver	%(rpm -q --qf "%{VERSION}" gcc)
 #
 Summary:	VMware Server
 Summary(pl):	VMware Server - wirtualna platforma dla stacji roboczej
@@ -43,11 +44,11 @@
 License:	custom, non-distributable
 Group:		Applications/Emulators
 Source0:	http://download3.vmware.com/software/vmserver/%{name}-%{_ver}-%{_build}.tar.gz
-# NoSource0-md5:	91821fc2649749911f0e2d0ca37b3eb8
+# NoSource0-md5:	3ef78e4deb44e51e99043e008c5a0e90
 Source1:	http://download3.vmware.com/software/vmserver/VMware-mui-%{_ver}-%{_build}.tar.gz
-# NoSource1-md5:	91821fc2649749911f0e2d0ca37b3eb8
+# NoSource1-md5:	4666688c7f1782022b55618f3cd620e8
 Source2:	http://knihovny.cvut.cz/ftp/pub/vmware/vmware-any-any-update%{_urel}.tar.gz
-# NoSource2-md5:	a597505f4827d0015d47c30eb41e21e4
+# NoSource2-md5:	b3ce457f5b9ae8b606fd70f56084877d
 Source3:	%{name}.init
 Source4:	%{name}-vmnet.conf
 Source5:	%{name}.png
@@ -353,18 +354,33 @@
 		rm -rf $mod-only
 		cp -a $mod-only.clean $mod-only
 		cd $mod-only
-		install -d include/{linux,config}
-		touch include/config/MARKER
-		ln -sf %{_kernelsrcdir}/config-$cfg .config
-		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm-%{_target_base_arch}
-		ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+		install -d o/include/linux
+		ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+		ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	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
+	%if %{with dist_kernel}
+		%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%else
+		install -d o/include/config
+		touch o/include/config/MARKER
+		ln -sf %{_kernelsrcdir}/scripts o/scripts
+		%endif
 		%{__make} -C %{_kernelsrcdir} modules \
 			VMWARE_VER=VME_V5 \
-			M=$PWD O=$PWD \
+			SRCROOT=$PWD \
+			M=$PWD O=$PWD/o \
 			VM_KBUILD=26 \
-			%{?with_verbose:V=1}
+			%{?with_verbose:V=1} \
+			VM_CCVER=%{_ccver}
 		mv -f $mod.ko ../built/$mod-$cfg.ko
 		cd -
 	done
@@ -719,6 +735,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/04/30 08:39:13  tommat
+- build 22874
+- any-any-update 101
+- rel 0.1
+- new kernel module build way taken from VMware-workstation
+
 Revision 1.5  2006/04/20 17:56:49  glen
 - fix chkconfig deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/VMware-server.spec?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list