packages: VirtualBox/VirtualBox.spec - move mount.vboxsf back to kernel pac...

[glen]

Author: glen                         Date: Tue Nov 17 23:38:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move mount.vboxsf back to kernel package, build it in kernel section separately

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.238 -> 1.239) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.238 packages/VirtualBox/VirtualBox.spec:1.239
--- packages/VirtualBox/VirtualBox.spec:1.238	Tue Nov 17 23:43:55 2009
+++ packages/VirtualBox/VirtualBox.spec	Wed Nov 18 00:38:49 2009
@@ -354,6 +354,7 @@
 %build_kernel_modules -m vboxvfs -C vboxvfs -c
 %build_kernel_modules -m vboxvideo -C vboxvideo_drm
 cd ..
+%{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c -o mount.vboxsf
 %endif
 
 %install
@@ -361,11 +362,10 @@
 
 %if %{with userspace}
 install -d \
-	$RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_desktopdir}} \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox \
-	$RPM_BUILD_ROOT/sbin
 
-install -p %{SOURCE9} $RPM_BUILD_ROOT/sbin/mount.vdi
+install -p %{SOURCE9} $RPM_BUILD_ROOT%{_sbindir}/mount.vdi
 install -p VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do
 	install -p out/linux.%{outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
@@ -388,10 +388,6 @@
 cp -a out/linux.%{outdir}/release/bin/components $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 cp -a out/linux.%{outdir}/release/bin/nls/* $RPM_BUILD_ROOT%{_libdir}/VirtualBox/nls
 
-install -d $RPM_BUILD_ROOT%{_sbindir}
-install -p out/linux.%{outdir}/release/bin/additions/mountvboxsf		\
-	$RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf
-
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 
 install -p out/linux.%{outdir}/release/bin/additions/vboxmouse_drv_16.so	\
@@ -407,7 +403,7 @@
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,modprobe.d},%{_sbindir}}
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxadd
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
@@ -418,7 +414,8 @@
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxvfs/vboxvfs -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxvideo_drm/vboxvideo -d misc
 
-install -d $RPM_BUILD_ROOT/etc/modprobe.d
+install -p mount.vboxsf $RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf
+
 cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/vboxvfs.conf
 # Somewhy filesystem is not called as same as kernel module.
 alias vboxsf vboxvfs
@@ -529,7 +526,6 @@
 %dir %{_libdir}/VirtualBox/additions
 %dir %{_libdir}/VirtualBox/components
 %dir %{_libdir}/VirtualBox/nls
-%attr(755,root,root) %{_sbindir}/mount.vboxsf
 %attr(755,root,root) %{_bindir}/VBoxBFE
 %attr(755,root,root) %{_bindir}/VBoxHeadless
 %attr(755,root,root) %{_bindir}/VBoxManage
@@ -651,6 +647,7 @@
 %files -n kernel%{_alt_kernel}-misc-vboxvfs
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/vboxvfs
+%attr(755,root,root) %{_sbindir}/mount.vboxsf
 /etc/modprobe.d/vboxvfs.conf
 /lib/modules/%{_kernel_ver}/misc/vboxvfs.ko*
 
@@ -665,6 +662,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.239  2009/11/17 23:38:49  glen
+- move mount.vboxsf back to kernel package, build it in kernel section separately
+
 Revision 1.238  2009/11/17 22:43:55  adamg
 - --without userspace --with kernel fails due to missing mount.vboxsf,
   move it from kernel subpackage to main package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.238&r2=1.239&f=u