SPECS: VMware-workstation.spec - added bcond to build kernel24 mod...

andree andree at pld-linux.org
Thu Aug 25 16:58:32 CEST 2005


Author: andree                       Date: Thu Aug 25 14:58:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bcond to build kernel24 modules

---- Files affected:
SPECS:
   VMware-workstation.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.66 SPECS/VMware-workstation.spec:1.67
--- SPECS/VMware-workstation.spec:1.66	Sat Aug 20 02:06:15 2005
+++ SPECS/VMware-workstation.spec	Thu Aug 25 16:58:27 2005
@@ -9,10 +9,14 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	smp		# without SMP kernel modules
 %bcond_without	userspace	# don't build userspace utilities
+%bcond_with	kernel24	# build kernel24 modules (disable kernel26)
 %bcond_with	internal_libs	# internal libs stuff
 %bcond_with	verbose		# verbose build (V=1)
 #
 %include	/usr/lib/rpm/macros.perl
+%if %{with kernel24}
+%define         _kernelsrcdir		/usr/src/linux-2.4
+%endif
 #
 %define		_ver	5.0.0
 %define		_build	13124
@@ -192,6 +196,82 @@
 %description -n kernel-smp-misc-vmnet -l pl
 Moduły jądra SMP dla VMware Workstation - vmnet-smp.
 
+%package -n kernel24-misc-vmmon
+Summary:	Kernel module for VMware Workstation
+Summary(pl):	Moduł jądra dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
+Provides:	kernel(vmmon) = %{version}-%{_rel}
+
+%description -n kernel24-misc-vmmon
+Kernel modules for VMware Workstation - vmmon.
+
+%description -n kernel24-misc-vmmon -l pl
+Moduły jądra dla VMware Workstation - vmmon.
+
+%package -n kernel24-misc-vmnet
+Summary:	Kernel module for VMware Workstation
+Summary(pl):	Moduł jądra dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
+Provides:	kernel(vmnet) = %{version}-%{_rel}
+
+%description -n kernel24-misc-vmnet
+Kernel modules for VMware Workstation - vmnet.
+
+%description -n kernel24-misc-vmnet -l pl
+Moduły jądra dla VMware Workstation - vmnet.
+
+%package -n kernel24-smp-misc-vmmon
+Summary:	SMP kernel module for VMware Workstation
+Summary(pl):	Moduł jądra SMP dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vmmon) = %{version}-%{_rel}
+
+%description -n kernel24-smp-misc-vmmon
+SMP kernel modules fov VMware Workstation - vmmon-smp.
+
+%description -n kernel24-smp-misc-vmmon -l pl
+Moduły jądra SMP dla VMware Workstation - vmmon-smp.
+
+%package -n kernel24-smp-misc-vmnet
+Summary:	SMP kernel module for VMware Workstation
+Summary(pl):	Moduł jądra SMP dla VMware Workstation
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+Provides:	kernel(vmnet) = %{version}-%{_rel}
+
+%description -n kernel24-smp-misc-vmnet
+SMP kernel module for VMware Workstation - vmnet-smp.
+
+%description -n kernel24-smp-misc-vmnet -l pl
+Moduły jądra SMP dla VMware Workstation - vmnet-smp.
+
 %prep
 %setup -q -n vmware-distrib
 %setup -qDT -n vmware-distrib -a1
@@ -220,6 +300,8 @@
 %if %{with kernel}
 rm -rf built
 mkdir built
+
+%if %{without kernel24}
 cp -a vmmon-only vmmon-only.clean
 cp -a vmnet-only vmnet-only.clean
 for mod in vmmon vmnet ; do
@@ -244,7 +326,42 @@
 		cd -
 	done
 done
-cd ..
+
+%else
+for mod in vmmon vmnet ; do
+	rm -rf $mod-only
+	tar xf $mod.tar
+	cd $mod-only
+	sed -i s/'^HEADER_DIR.*'/'HEADER_DIR = \/usr\/src\/linux-2.4\/include'/ Makefile
+	sed -i s/'^BUILD_DIR.*'/'BUILD_DIR = .'/ Makefile
+
+%if %{with smp}
+	%{__make} \
+		VM_KBUILD=no VMWARE_VER=VME_V5 \
+		M=$PWD O=$PWD CC=%{kgcc} \
+		INCLUDES="%{rpmcflags} -I. -D__KERNEL_SMP=1 -D__SMP__ -I%{_kernelsrcdir}/include"
+	if [ -e $mod-xxx-* ]; then
+		mv -f $mod-xxx-* ../built/$mod-smp.o
+	else
+		mv -f driver-*/$mod-xxx-* ../built/$mod-smp.o
+	fi
+
+	%{__make} VM_KBUILD=no clean
+%endif
+	%{__make} \
+		VM_KBUILD=no VMWARE_VER=VME_V5 \
+		M=$PWD O=$PWD CC=%{kgcc} \
+		INCLUDES="%{rpmcflags} -I. -I%{_kernelsrcdir}/include"
+	if [ -e $mod-xxx-* ]; then
+		mv -f $mod-xxx-* ../built/$mod.o
+	else
+		mv -f driver-*/$mod-xxx-* ../built/$mod.o
+	fi
+
+	cd ..
+done
+%endif # kernel24
+
 %endif
 
 %install
@@ -267,6 +384,8 @@
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
 cd vmware-any-any-update%{_urel}
+
+%if %{without kernel24}
 install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.ko
 install built/vmnet-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
@@ -277,6 +396,21 @@
 install built/vmnet-smp.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.ko
 %endif
+
+%else
+install built/vmmon.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmmon.o
+install built/vmnet.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.o
+%if %{with smp} && %{with dist_kernel}
+install built/vmmon-smp.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmmon.o
+install built/vmnet-smp.o \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmnet.o
+%endif
+
+%endif
+
 cd -
 %endif
 
@@ -358,6 +492,30 @@
 %postun -n kernel-smp-misc-vmnet
 %depmod %{_kernel_ver}smp
 
+%post	-n kernel24-misc-vmmon
+%depmod %{_kernel_ver}
+
+%postun -n kernel24-misc-vmmon
+%depmod %{_kernel_ver}
+
+%post	-n kernel24-misc-vmnet
+%depmod %{_kernel_ver}
+
+%postun -n kernel24-misc-vmnet
+%depmod %{_kernel_ver}
+
+%post	-n kernel24-smp-misc-vmmon
+%depmod %{_kernel_ver}smp
+
+%postun -n kernel24-smp-misc-vmmon
+%depmod %{_kernel_ver}smp
+
+%post	-n kernel24-smp-misc-vmnet
+%depmod %{_kernel_ver}smp
+
+%postun -n kernel24-smp-misc-vmnet
+%depmod %{_kernel_ver}smp
+
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -428,6 +586,7 @@
 %endif
 
 %if %{with kernel}
+%if %{without kernel24}
 %files -n kernel-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -445,6 +604,28 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/vmnet.ko*
 %endif
+
+%else
+%files -n kernel24-misc-vmmon
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/vmmon.o*
+
+%files -n kernel24-misc-vmnet
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/vmnet.o*
+
+%if %{with smp} && %{with dist_kernel}
+%files	-n kernel24-smp-misc-vmmon
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/vmmon.o*
+
+%files	-n kernel24-smp-misc-vmnet
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/misc/vmnet.o*
+%endif
+
+%endif
+
 %endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -453,6 +634,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2005/08/25 14:58:27  andree
+- added bcond to build kernel24 modules
+
 Revision 1.66  2005/08/20 00:06:15  charles
 - rpmbuild(macros) >= 1.217
 - added kernel, userspace, verbose bconds
================================================================

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




More information about the pld-cvs-commit mailing list