From: shadzik Date: Mon, 20 Aug 2007 17:38:46 +0000 (+0000) Subject: - Th deps: X-Git-Tag: VMware-1_0~5 X-Git-Url: http://git.pld-linux.org/?p=packages%2FVMware-server.git;a=commitdiff_plain;h=7b8035798a7aad8bc72d28f0396f91296d80f697 - Th deps: + remove whole smp stuff + remove kernel24 support + proper macros + s/up/dist/ changes - build fine on current Th Changed files: VMware-server.spec -> 1.27 --- diff --git a/VMware-server.spec b/VMware-server.spec index 7e677ee..472c9fa 100644 --- a/VMware-server.spec +++ b/VMware-server.spec @@ -18,17 +18,11 @@ # Conditional build: %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # don't build kernel modules -%bcond_without up # without UP 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 1.0.3 %define _build 44356 @@ -63,9 +57,9 @@ NoSource: 1 NoSource: 2 URL: http://www.vmware.com/ BuildRequires: gcc-c++ -%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7} +%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.20.2} BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 Requires: libgnomecanvasmm ExclusiveArch: %{ix86} @@ -169,8 +163,8 @@ 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 +%requires_releq_kernel +Requires(postun): %releq_kernel %endif Provides: kernel(vmmon) = %{version}-%{_rel} @@ -188,8 +182,8 @@ 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 +%requires_releq_kernel +Requires(postun): %releq_kernel %endif Provides: kernel(vmnet) = %{version}-%{_rel} @@ -199,120 +193,6 @@ Kernel modules for VMware Server - vmnet. %description -n kernel-misc-vmnet -l pl.UTF-8 Moduły jądra dla VMware Server - vmnet. -%package -n kernel-smp-misc-vmmon -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 kernel-smp-misc-vmmon -SMP kernel modules fov VMware Server - vmmon-smp. - -%description -n kernel-smp-misc-vmmon -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmmon-smp. - -%package -n kernel-smp-misc-vmnet -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 kernel-smp-misc-vmnet -SMP kernel module for VMware Server - vmnet-smp. - -%description -n kernel-smp-misc-vmnet -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmnet-smp. - -%package -n kernel24-misc-vmmon -Summary: Kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra dla VMware Server -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 Server - vmmon. - -%description -n kernel24-misc-vmmon -l pl.UTF-8 -Moduły jądra dla VMware Server - vmmon. - -%package -n kernel24-misc-vmnet -Summary: Kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra dla VMware Server -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 Server - vmnet. - -%description -n kernel24-misc-vmnet -l pl.UTF-8 -Moduły jądra dla VMware Server - vmnet. - -%package -n kernel24-smp-misc-vmmon -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 Server - vmmon-smp. - -%description -n kernel24-smp-misc-vmmon -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmmon-smp. - -%package -n kernel24-smp-misc-vmnet -Summary: SMP kernel module for VMware Server -Summary(pl.UTF-8): Moduł jądra SMP dla VMware Server -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 Server - vmnet-smp. - -%description -n kernel24-smp-misc-vmnet -l pl.UTF-8 -Moduły jądra SMP dla VMware Server - vmnet-smp. - %prep %setup -q -n vmware-server-distrib -a1 -a2 tar zxf vmware-mui-distrib/console-distrib/%{name}-console-%{_ver}-%{_build}.tar.gz @@ -360,9 +240,8 @@ cd lib/modules/source rm -rf built mkdir built -%if !%{with kernel24} for mod in vmmon vmnet ; do - for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do + for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then exit 1 fi @@ -400,42 +279,6 @@ for mod in vmmon vmnet ; do cd - done done - -%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 @@ -476,31 +319,10 @@ install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc #cd vmware-any-any-update%{_urel} cd lib/modules/source -%if !%{with kernel24} -install built/vmmon-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \ +install built/vmmon-%{?with_dist_kernel:dist}%{!?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 \ +install built/vmnet-%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}.ko \ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/vmnet.ko -%if %{with smp} && %{with dist_kernel} -install built/vmmon-smp.ko \ - $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/vmmon.ko -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 @@ -578,42 +400,6 @@ fi %postun -n kernel-misc-vmnet %depmod %{_kernel_ver} -%post -n kernel-smp-misc-vmmon -%depmod %{_kernel_ver}smp - -%postun -n kernel-smp-misc-vmmon -%depmod %{_kernel_ver}smp - -%post -n kernel-smp-misc-vmnet -%depmod %{_kernel_ver}smp - -%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) @@ -721,8 +507,6 @@ fi %endif %if %{with kernel} -%if %{without kernel24} -%if %{with up} || %{without dist_kernel} %files -n kernel-misc-vmmon %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmmon.ko* @@ -731,36 +515,3 @@ fi %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmnet.ko* %endif - -%if %{with smp} && %{with dist_kernel} -%files -n kernel-smp-misc-vmmon -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}smp/misc/vmmon.ko* - -%files -n kernel-smp-misc-vmnet -%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