SPECS: VMware-workstation.spec - removed kernel up stuff - removed...

arvenil arvenil at pld-linux.org
Mon Sep 10 10:13:35 CEST 2007


Author: arvenil                      Date: Mon Sep 10 08:13:34 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed kernel up stuff
- removed kernel24 support
- clean (removed samba package)

---- Files affected:
SPECS:
   VMware-workstation.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.110 SPECS/VMware-workstation.spec:1.111
--- SPECS/VMware-workstation.spec:1.110	Sat Aug 18 19:12:41 2007
+++ SPECS/VMware-workstation.spec	Mon Sep 10 10:13:29 2007
@@ -7,17 +7,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
 
 %ifarch %{x8664}
 %undefine	with_userspace
@@ -118,18 +112,6 @@
 %description networking -l pl.UTF-8
 Narzędzia VMware do obsługi sieci.
 
-%package samba
-Summary:	VMware SMB utilities
-Summary(pl.UTF-8):	Narzędzia VMware do SMB
-Group:		Applications/Emulators
-Requires:	%{name} = %{version}-%{release}
-
-%description samba
-VMware SMB utilities.
-
-%description samba -l pl.UTF-8
-Narzędzia VMware do SMB.
-
 %package -n kernel%{_alt_kernel}-misc-vmmon
 Summary:	Kernel module for VMware Workstation
 Summary(pl.UTF-8):	Moduł jądra dla VMware Workstation
@@ -138,8 +120,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}
 
@@ -157,8 +139,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}
 
@@ -168,120 +150,6 @@
 %description -n kernel%{_alt_kernel}-misc-vmnet -l pl.UTF-8
 Moduły jądra dla VMware Workstation - vmnet.
 
-%package -n kernel%{_alt_kernel}-smp-misc-vmmon
-Summary:	SMP kernel module for VMware Workstation
-Summary(pl.UTF-8):	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 kernel%{_alt_kernel}-smp-misc-vmmon
-SMP kernel modules fov VMware Workstation - vmmon-smp.
-
-%description -n kernel%{_alt_kernel}-smp-misc-vmmon -l pl.UTF-8
-Moduły jądra SMP dla VMware Workstation - vmmon-smp.
-
-%package -n kernel%{_alt_kernel}-smp-misc-vmnet
-Summary:	SMP kernel module for VMware Workstation
-Summary(pl.UTF-8):	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 kernel%{_alt_kernel}-smp-misc-vmnet
-SMP kernel module for VMware Workstation - vmnet-smp.
-
-%description -n kernel%{_alt_kernel}-smp-misc-vmnet -l pl.UTF-8
-Moduły jądra SMP dla VMware Workstation - vmnet-smp.
-
-%package -n kernel24-misc-vmmon
-Summary:	Kernel module for VMware Workstation
-Summary(pl.UTF-8):	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.UTF-8
-Moduły jądra dla VMware Workstation - vmmon.
-
-%package -n kernel24-misc-vmnet
-Summary:	Kernel module for VMware Workstation
-Summary(pl.UTF-8):	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.UTF-8
-Moduły jądra dla VMware Workstation - vmnet.
-
-%package -n kernel24-smp-misc-vmmon
-Summary:	SMP kernel module for VMware Workstation
-Summary(pl.UTF-8):	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.UTF-8
-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.UTF-8):	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.UTF-8
-Moduły jądra SMP dla VMware Workstation - vmnet-smp.
-
 %prep
 %setup -q -n vmware-distrib -a1
 #%setup -qDT -n vmware-distrib -a1
@@ -313,7 +181,6 @@
 rm -rf built
 mkdir built
 
-%if !%{with kernel24}
 %define ModuleBuildArgs VMWARE_VER=VME_V5 SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{_ccver}
 
 %build_kernel_modules -c -C vmmon-only -m vmmon %{ModuleBuildArgs} <<'EOF'
@@ -322,42 +189,6 @@
 %build_kernel_modules -c -C vmnet-only -m vmnet %{ModuleBuildArgs} <<'EOF'
 rm -f *.o
 EOF
-
-%else
-for mod in vmmon vmnet ; do
-	rm -rf $mod-only
-	tar xf ../lib/modules/source/$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
@@ -377,27 +208,12 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 
 cd vmware-any-any-update%{_urel}
 
-%if !%{with kernel24}
 %install_kernel_modules -m vmmon-only/vmmon,vmnet-only/vmnet -d misc
 
-%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
 
@@ -466,42 +282,6 @@
 %postun -n kernel%{_alt_kernel}-misc-vmnet
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-misc-vmmon
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-misc-vmmon
-%depmod %{_kernel_ver}smp
-
-%post	-n kernel%{_alt_kernel}-smp-misc-vmnet
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_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)
@@ -560,22 +340,9 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/nat/nat.conf
 %verify(not md5 mtime size) %{_sysconfdir}/vmware/vmnet8/dhcpd/dhcpd.leases*
-
-%if 0
-%files samba
-%defattr(644,root,root,755)
-%doc lib/configurator/vmnet-smb.conf
-%attr(755,root,root) %{_bindir}/vmware-nmbd
-%attr(755,root,root) %{_bindir}/vmware-smbd
-%attr(755,root,root) %{_bindir}/vmware-smbpasswd
-%attr(755,root,root) %{_bindir}/vmware-smbpasswd.bin
-%{_libdir}/vmware/smb
-%endif
 %endif
 
-%if %{with kernel}
-%if %{without kernel24}
-%if %{with up} || %{without dist_kernel}
+%if %{with kernel} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -585,45 +352,17 @@
 /lib/modules/%{_kernel_ver}/misc/vmnet.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files	-n kernel%{_alt_kernel}-smp-misc-vmmon
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/vmmon.ko*
-
-%files	-n kernel%{_alt_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.111  2007/09/10 08:13:29  arvenil
+- removed kernel up stuff
+- removed kernel24 support
+- clean (removed samba package)
+
 Revision 1.110  2007/08/18 17:12:41  arvenil
 - vmware-any-any-update up to 113 (works for me)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VMware-workstation.spec?r1=1.110&r2=1.111&f=u



More information about the pld-cvs-commit mailing list