On 20.06.2010 12:17, Przemyslaw Iskra wrote: > On Sun, Jun 20, 2010 at 08:30:33AM +0200, Łukasz wrote: > > >> Moduły vmmemctl i pvscsi wyleciały po prostu, za README: >> >> * The pvscsi driver was removed from the open-vm-tools distribution (it >> is upstream as of Linux 2.6.33). >> * vmmemctl: Linux driver removed (it's now upstream), plus >> cleanup and simplification of the FreeBSD and Solaris drivers. >> > W takim wypadku te: > Conflicts: kernel-misc-pvscsi > Conflicts: kernel-misc-vmmemctl > > zupełnie nie mają miejsca bytu. Chciałem wymusić deinstalację. > Tym bardziej że dodałeś je do paczki > userspace. > Nie rozumiem.
> Co najwyżej można dodać O: kernel-misc-pvscsi, kernel-misc-vmmemctl w > kernelach 2.6.33 i nowszych. > > No i w tym specu trzeba uaktualnić BR: kernela do 2.6.33. > > Dodałem BR na kernel-module-build. Dołożyłem też Suggest, które moim zdaniem mają sens. Dzięki wszystkim za uwagi. W załączeniu poprawiona wersja. Łukasz
--- open-vm-tools.old 2010-06-20 01:10:27.008533393 +0200 +++ open-vm-tools.spec 2010-06-21 21:30:03.106668030 +0200 @@ -5,8 +5,8 @@ %bcond_without dist_kernel # without distribution kernel %bcond_without userspace # without userspace package # -%define snap 2010.02.23 -%define rev 236320 +%define snap 2010.06.16 +%define rev 268169 %define modsrc modules/linux %define rel 6 Summary: VMWare guest utilities @@ -17,14 +17,14 @@ License: GPL Group: Applications/System Source0: http://downloads.sourceforge.net/open-vm-tools/%{name}-%{snap}-%{rev}.tar.gz -# Source0-md5: 25ddc284fc6eb478384cca57a477c5b6 +# Source0-md5: 35c002f446a952e70cd1540dbb1d1fe5 Source1: %{name}-packaging Source2: %{name}-modprobe.d Source3: %{name}-init Source4: %{name}-vmware-user.desktop -Patch0: %{name}-libpng.patch URL: http://open-vm-tools.sourceforge.net/ BuildRequires: rpmbuild(macros) >= 1.453 + %if %{with userspace} BuildRequires: autoconf BuildRequires: doxygen @@ -50,9 +50,16 @@ Requires: ethtool Requires: libdnet Requires: libicu +Suggests: kernel-misc-vmblock +Suggests: kernel-misc-vmci +Suggests: kernel-misc-vmhgfs +Suggests: kernel-misc-vmsync +Suggests: kernel-misc-vmxnet +Suggests: kernel-misc-vsock + %endif %if %{with kernel} && %{with dist_kernel} -BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.16 +BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.33 %endif ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -100,23 +107,6 @@ NarzÄdzia dla systemu-goÅcia dla VMware. Ten pakiet zawiera graficznÄ czÄÅÄ narzÄdzi. -%package -n kernel%{_alt_kernel}-misc-pvscsi -Summary: VMware pvscsi Linux kernel module -Summary(pl.UTF-8): ModuÅ jÄ dra Linuksa VMware pvscsi -Release: %{r...@%{_kernel_ver_str} -Group: Base/Kernel -Requires(post,postun): /sbin/depmod -Requires: dev >= 2.9.0-7 -%if %{with dist_kernel} -%requires_releq_kernel -Requires(postun): %releq_kernel -%endif - -%description -n kernel%{_alt_kernel}-misc-pvscsi -VMware pvscsi Linux kernel module. - -%description -n kernel%{_alt_kernel}-misc-pvscsi -l pl.UTF-8 -ModuÅ jÄ dra Linuksa VMware pvscsi. %package -n kernel%{_alt_kernel}-misc-vmblock Summary: VMware vmblock Linux kernel module @@ -172,24 +162,6 @@ %description -n kernel%{_alt_kernel}-misc-vmhgfs -l pl.UTF-8 ModuÅ jÄ dra Linuksa VMware vmhgfs. -%package -n kernel%{_alt_kernel}-misc-vmmemctl -Summary: VMware vmmemctl Linux kernel module -Summary(pl.UTF-8): ModuÅ jÄ dra Linuksa VMware vmmemctl -Release: %{r...@%{_kernel_ver_str} -Group: Base/Kernel -Requires(post,postun): /sbin/depmod -Requires: dev >= 2.9.0-7 -%if %{with dist_kernel} -%requires_releq_kernel -Requires(postun): %releq_kernel -%endif - -%description -n kernel%{_alt_kernel}-misc-vmmemctl -VMware vmmemctl Linux kernel module. - -%description -n kernel%{_alt_kernel}-misc-vmmemctl -l pl.UTF-8 -ModuÅ jÄ dra Linuksa VMware vmmemctl. - %package -n kernel%{_alt_kernel}-misc-vmsync Summary: VMware vmsync Linux kernel module Summary(pl.UTF-8): ModuÅ jÄ dra Linuksa VMware vmsync @@ -245,20 +217,16 @@ ModuÅ jÄ dra Linuksa VMware vsock. %prep -#%setup -q -n %{name}-%{snap}-%{rev} %setup -q -n %{name}-%{snap}-%{rev} -%patch0 -p1 cp %{SOURCE1} packaging %{__sed} -i -e 's|##{BUILD_OUTPUT}##|build|' docs/api/doxygen.conf %build %if %{with kernel} export OVT_SOURCE_DIR=$PWD -%build_kernel_modules -C %{modsrc}/pvscsi -m pvscsi SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} %build_kernel_modules -C %{modsrc}/vmblock -m vmblock SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} %build_kernel_modules -C %{modsrc}/vmci -m vmci SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} %build_kernel_modules -C %{modsrc}/vmhgfs -m vmhgfs SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} -%build_kernel_modules -C %{modsrc}/vmmemctl -m vmmemctl SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} %build_kernel_modules -C %{modsrc}/vmsync -m vmsync SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} %build_kernel_modules -C %{modsrc}/vmxnet -m vmxnet SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} %build_kernel_modules -C %{modsrc}/vsock -m vsock SRCROOT=$PWD VM_KBUILD=26 VM_CCVER=%{cc_version} @@ -276,11 +244,9 @@ rm -rf $RPM_BUILD_ROOT %if %{with kernel} -%install_kernel_modules -m %{modsrc}/pvscsi/pvscsi -d misc %install_kernel_modules -m %{modsrc}/vmblock/vmblock -d misc %install_kernel_modules -m %{modsrc}/vmci/vmci -d misc %install_kernel_modules -m %{modsrc}/vmhgfs/vmhgfs -d misc -%install_kernel_modules -m %{modsrc}/vmmemctl/vmmemctl -d misc %install_kernel_modules -m %{modsrc}/vmsync/vmsync -d misc %install_kernel_modules -m %{modsrc}/vmxnet/vmxnet -d misc %install_kernel_modules -m %{modsrc}/vsock/vsock -d misc @@ -297,7 +263,7 @@ install -d $RPM_BUILD_ROOT/etc/{modprobe.d,rc.d/init.d,xdg/autostart} cp %{SOURCE2} $RPM_BUILD_ROOT/etc/modprobe.d/%{name}.conf cp %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} -cp %{SOURCE4} $RPM_BUILD_ROOT/etc/xdg/autostart/vmware-user.desktop +cp %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user.desktop %endif %clean @@ -316,9 +282,6 @@ %postun -p /sbin/ldconfig -%post -n kernel%{_alt_kernel}-misc-pvscsi -%depmod %{_kernel_ver} - %post -n kernel%{_alt_kernel}-misc-vmblock %depmod %{_kernel_ver} @@ -328,9 +291,6 @@ %post -n kernel%{_alt_kernel}-misc-vmhgfs %depmod %{_kernel_ver} -%post -n kernel%{_alt_kernel}-misc-vmmemctl -%depmod %{_kernel_ver} - %post -n kernel%{_alt_kernel}-misc-vmsync %depmod %{_kernel_ver} @@ -345,17 +305,16 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README packaging %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/vmtoolsd -%dir /etc/vmware-tools -%attr(755,root,root) /etc/vmware-tools/*vm-* -#%config(noreplace) %verify(not md5 mtime size) /etc/vmware-tools/tools.conf -%dir /etc/vmware-tools/plugins +%dir %{_sysconfdir}/vmware-tools +%attr(755,root,root) %{_sysconfdir}/vmware-tools/*vm-* +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware-tools/statechange.subr +%dir %{_sysconfdir}/vmware-tools/plugins %attr(755,root,root) /sbin/mount.vmhgfs %attr(755,root,root) %{_bindir}/vmtoolsd %attr(755,root,root) %{_bindir}/vmware-checkvm %attr(755,root,root) %{_bindir}/vmware-hgfsclient %attr(755,root,root) %{_bindir}/vmware-rpctool %attr(755,root,root) %{_bindir}/vmware-toolbox-cmd -%attr(4755,root,root) %{_bindir}/vmware-user-suid-wrapper %attr(755,root,root) %{_bindir}/vmware-xferlogs %attr(755,root,root) %{_bindir}/vmware-vmblock-fuse %attr(755,root,root) %{_sbindir}/mount.vmhgfs @@ -373,9 +332,6 @@ %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmsvc/libpowerOps.so %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmsvc/libtimeSync.so %attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmsvc/libvmbackup.so -%dir %{_libdir}/open-vm-tools/plugins/vmusr -%attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libresolutionSet.so -%attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libvixUser.so %attr(754,root,root) /etc/rc.d/init.d/%{name} /etc/modprobe.d/%{name}.conf @@ -396,17 +352,24 @@ %files gui %defattr(644,root,root,755) + +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vmware-tools/scripts/vmware/network +%defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/vmware-toolbox %attr(755,root,root) %{_bindir}/vmware-user +%attr(755,root,root) %{_datadir}/open-vm-tools/messages/toolboxcmd_de.vmsg +%attr(755,root,root) %{_datadir}/open-vm-tools/messages/toolboxcmd_ja.vmsg +%attr(755,root,root) %{_datadir}/open-vm-tools/messages/toolboxcmd_zh.vmsg +%attr(4755,root,root) %{_bindir}/vmware-user-suid-wrapper +%dir %{_libdir}/open-vm-tools/plugins/vmusr +%attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libresolutionSet.so +%attr(755,root,root) %{_libdir}/open-vm-tools/plugins/vmusr/libvixUser.so %{_desktopdir}/vmware-user.desktop %{_sysconfdir}/xdg/autostart/vmware-user.desktop - +%doc %{_docdir}/open-vm-tools/api %endif %if %{with kernel} -%files -n kernel%{_alt_kernel}-misc-pvscsi -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/pvscsi.ko* %files -n kernel%{_alt_kernel}-misc-vmblock %defattr(644,root,root,755) @@ -420,10 +383,6 @@ %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmhgfs.ko* -%files -n kernel%{_alt_kernel}-misc-vmmemctl -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/vmmemctl.ko* - %files -n kernel%{_alt_kernel}-misc-vmsync %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/vmsync.ko*
_______________________________________________ pld-devel-pl mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
