SPECS: VMware-server.spec - Th deps: + remove whole smp stuff + re...
shadzik
shadzik at pld-linux.org
Mon Aug 20 19:38:52 CEST 2007
Author: shadzik Date: Mon Aug 20 17:38:52 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- Th deps:
+ remove whole smp stuff
+ remove kernel24 support
+ proper macros
+ s/up/dist/ changes
- build fine on current Th
---- Files affected:
SPECS:
VMware-server.spec (1.26 -> 1.27)
---- Diffs:
================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.26 SPECS/VMware-server.spec:1.27
--- SPECS/VMware-server.spec:1.26 Sat May 19 23:49:46 2007
+++ SPECS/VMware-server.spec Mon Aug 20 19:38:46 2007
@@ -19,17 +19,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
@@ -64,9 +58,9 @@
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}
@@ -170,8 +164,8 @@
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}
@@ -189,8 +183,8 @@
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}
@@ -200,120 +194,6 @@
%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
@@ -361,9 +241,8 @@
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
@@ -401,42 +280,6 @@
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
@@ -477,31 +320,10 @@
#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
@@ -579,42 +401,6 @@
%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)
@@ -722,8 +508,6 @@
%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*
@@ -733,45 +517,20 @@
/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
-
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2007/08/20 17:38:46 shadzik
+- Th deps:
++ remove whole smp stuff
++ remove kernel24 support
++ proper macros
++ s/up/dist/ changes
+- build fine on current Th
+
Revision 1.26 2007/05/19 21:49:46 arekm
- 1.0.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VMware-server.spec?r1=1.26&r2=1.27&f=u
More information about the pld-cvs-commit
mailing list