SPECS: VirtualBox.spec - build vboxnetflt host driver kernel module - vdito...

hawk hawk at pld-linux.org
Fri Dec 19 14:45:44 CET 2008


Author: hawk                         Date: Fri Dec 19 13:45:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build vboxnetflt host driver kernel module
- vditool seems to be removed

---- Files affected:
SPECS:
   VirtualBox.spec (1.163 -> 1.164) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.163 SPECS/VirtualBox.spec:1.164
--- SPECS/VirtualBox.spec:1.163	Fri Dec 19 13:17:53 2008
+++ SPECS/VirtualBox.spec	Fri Dec 19 14:45:39 2008
@@ -53,6 +53,7 @@
 Patch3:		%{pname}-disable-xclient-build.patch
 Patch4:		%{pname}-configure-spaces.patch
 Patch5:		%{pname}-build_fix.patch
+Patch6:		%{pname}-vboxnetflt_export.patch
 URL:		http://www.virtualbox.org/
 BuildRequires:	rpmbuild(macros) >= 1.379
 %if %{with userspace}
@@ -213,6 +214,26 @@
 %description -n kernel%{_alt_kernel}-misc-vboxdrv -l pl.UTF-8
 Moduł jądra Linuksa vboxdrv dla VirtualBoksa.
 
+%package -n kernel%{_alt_kernel}-misc-vboxnetflt
+Summary:	VirtualBox OSE Guest Additions for Linux Module
+Summary(pl.UTF-8):	Moduł jądra Linuksa dla VirtualBoksa
+Release:	%{rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+Requires:	dev >= 2.9.0-7
+Requires:	kernel%{_alt_kernel}-misc-vboxdrv
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
+%endif
+Provides:	kernel(vboxnetflt) = %{version}-%{rel}
+
+%description -n kernel%{_alt_kernel}-misc-vboxnetflt
+VirtualBox OSE Guest Additions for Linux Module.
+
+%description -n kernel%{_alt_kernel}-misc-vboxnetflt -l pl.UTF-8
+Moduł jądra Linuksa vboxnetflt dla VirtualBoksa.
+
 %package -n kernel%{_alt_kernel}-misc-vboxvfs
 Summary:	Host file system access VFS for VirtualBox OSE
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla VirtualBoksa
@@ -271,6 +292,7 @@
 
 %patch4 -p1
 %patch5 -p0
+%patch6 -p1
 
 cat <<'EOF' > udev.conf
 KERNEL=="vboxdrv", NAME="%k", GROUP="vbox", MODE="0660"
@@ -286,6 +308,10 @@
 ../src/VBox/HostDrivers/Support/linux/export_modules modules.tar.gz && \
 	tar -zxf modules.tar.gz && rm -f modules.tar.gz
 sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxdrv/Makefile
+chmod 755 ../src/VBox/HostDrivers/VBoxNetFlt/linux/export_modules
+../src/VBox/HostDrivers/VBoxNetFlt/linux/export_modules modules.tar.gz && \
+	tar -zxf modules.tar.gz && rm -f modules.tar.gz
+sed -i -e 's/-DVBOX_WITH_HARDENING//g' vboxdrv/Makefile
 
 %build
 %if %{with userspace}
@@ -310,6 +336,7 @@
 cd PLD-MODULE-BUILD
 %build_kernel_modules -m vboxadd -C vboxadd
 %build_kernel_modules -m vboxdrv -C vboxdrv
+%build_kernel_modules -m vboxnetflt -C vboxnetflt
 cp -a vboxadd/Module.symvers vboxvfs
 %build_kernel_modules -m vboxvfs -C vboxvfs -c
 cd ..
@@ -324,7 +351,7 @@
 	$RPM_BUILD_ROOT%{_libdir}/VirtualBox
 
 install VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_libdir}/VirtualBox
-for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox,vditool}; do
+for f in {VBox{BFE,Headless,Manage,SDL,SVC,Tunctl,XPCOMIPCD},VirtualBox}; do
 	install out/linux.%{outdir}/release/bin/$f $RPM_BUILD_ROOT%{_libdir}/VirtualBox/$f
 	ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
@@ -371,6 +398,7 @@
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxadd/vboxadd -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetflt/vboxnetflt -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxvfs/vboxvfs -d misc
 %endif
 
@@ -426,6 +454,12 @@
 	/sbin/chkconfig --del vboxdrv
 fi
 
+%post	-n kernel%{_alt_kernel}-misc-vboxnetflt
+%depmod %{_kernel_ver}
+
+%postun	-n kernel%{_alt_kernel}-misc-vboxnetflt
+%depmod %{_kernel_ver}
+
 %post	-n kernel%{_alt_kernel}-misc-vboxvfs
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxvfs
@@ -449,10 +483,10 @@
 %dir %{_libdir}/VirtualBox/components
 %dir %{_libdir}/VirtualBox/nls
 %attr(755,root,root) %{_bindir}/mountvboxsf
-%attr(755,root,root) %{_bindir}/vditool
+#%attr(755,root,root) %{_bindir}/vditool
 %attr(755,root,root) %{_bindir}/VBox*
 %attr(755,root,root) %{_bindir}/VirtualBox
-%attr(755,root,root) %{_libdir}/VirtualBox/vditool
+#%attr(755,root,root) %{_libdir}/VirtualBox/vditool
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxSVC
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxBFE
 %attr(755,root,root) %{_libdir}/VirtualBox/VBoxHeadless
@@ -525,6 +559,10 @@
 %attr(754,root,root) /etc/rc.d/init.d/vboxdrv
 /lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*
 
+%files -n kernel%{_alt_kernel}-misc-vboxnetflt
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*
+
 %files -n kernel%{_alt_kernel}-misc-vboxvfs
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vboxvfs.ko*
@@ -536,6 +574,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164  2008/12/19 13:45:39  hawk
+- build vboxnetflt host driver kernel module
+- vditool seems to be removed
+
 Revision 1.163  2008/12/19 12:17:53  hawk
 - added build fix from upstream, still NFY
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.163&r2=1.164&f=u



More information about the pld-cvs-commit mailing list