packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-export_modules....

lkrotowski lkrotowski at pld-linux.org
Tue Jan 12 21:09:03 CET 2010 

Author: lkrotowski                   Date: Tue Jan 12 20:09:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add network adapter driver module subpackage

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.251 -> 1.252) , VirtualBox-export_modules.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.251 packages/VirtualBox/VirtualBox.spec:1.252
--- packages/VirtualBox/VirtualBox.spec:1.251	Fri Jan  8 19:10:38 2010
+++ packages/VirtualBox/VirtualBox.spec	Tue Jan 12 21:08:57 2010
@@ -6,6 +6,7 @@
 # - Package utils (and write initscripts ?) for Guest OS.
 # - Check License of VBoxGuestAdditions_*.iso, it's probably not GPL v2.
 #   If so check if it is distributable.
+# - Add chkconfig script for vboxnetadp.
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
@@ -230,8 +231,29 @@
 Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik wsparcia dla
 systemu głównego.
 
+%package -n kernel%{_alt_kernel}-misc-vboxnetadp
+Summary:	VirtualBox OSE Network Adapter Driver.
+Summary(pl.UTF-8):	Moduł jądra Linuksa dla VirtualBoksa OSE
+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-vboxnetadp
+VirtualBox OSE Network Adapter Driver.
+
+%description -n kernel%{_alt_kernel}-misc-vboxnetadp -l pl.UTF-8
+Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik witrualnej
+karty sieciowej.
+
 %package -n kernel%{_alt_kernel}-misc-vboxnetflt
-Summary:	VirtualBox OSE Guest Additions for Linux Module
+Summary:	VirtualBox OSE Network Filter Driver.
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla VirtualBoksa OSE
 Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
@@ -361,6 +383,7 @@
 cd PLD-MODULE-BUILD
 %build_kernel_modules -m vboxguest -C vboxguest
 %build_kernel_modules -m vboxdrv -C vboxdrv
+%build_kernel_modules -m vboxnetadp -C vboxnetadp
 %build_kernel_modules -m vboxnetflt -C vboxnetflt
 cp -a vboxguest/Module.symvers vboxvfs
 %build_kernel_modules -m vboxvfs -C vboxvfs -c
@@ -422,6 +445,7 @@
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxguest/vboxguest -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/vboxnetadp/vboxnetadp -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxnetflt/vboxnetflt -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxvfs/vboxvfs -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxvideo_drm/vboxvideo -d misc
@@ -446,6 +470,7 @@
     kernel-misc-vboxdrv-%{version}-%{rel}@%{_kernel_ver_str}
 
 Additionally you might want to install:
+    kernel-misc-vboxnetadp-%{version}-%{rel}@%{_kernel_ver_str}
     kernel-misc-vboxnetflt-%{version}-%{rel}@%{_kernel_ver_str}
 
 On Guest Linux system you might want to install:
@@ -496,6 +521,12 @@
 	/sbin/chkconfig --del vboxdrv
 fi
 
+%post	-n kernel%{_alt_kernel}-misc-vboxnetadp
+%depmod %{_kernel_ver}
+
+%postun	-n kernel%{_alt_kernel}-misc-vboxnetadp
+%depmod %{_kernel_ver}
+
 %post	-n kernel%{_alt_kernel}-misc-vboxnetflt
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxnetflt
@@ -653,6 +684,10 @@
 %attr(754,root,root) /etc/rc.d/init.d/vboxdrv
 /lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*
 
+%files -n kernel%{_alt_kernel}-misc-vboxnetadp
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko*
+
 %files -n kernel%{_alt_kernel}-misc-vboxnetflt
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/vboxnetflt
@@ -676,6 +711,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.252  2010/01/12 20:08:57  lkrotowski
+- add network adapter driver module subpackage
+
 Revision 1.251  2010/01/08 18:10:38  arekm
 - release 3
 

================================================================
Index: packages/VirtualBox/VirtualBox-export_modules.patch
diff -u packages/VirtualBox/VirtualBox-export_modules.patch:1.3 packages/VirtualBox/VirtualBox-export_modules.patch:1.4
--- packages/VirtualBox/VirtualBox-export_modules.patch:1.3	Sat Jun 20 23:58:08 2009
+++ packages/VirtualBox/VirtualBox-export_modules.patch	Tue Jan 12 21:08:58 2010
@@ -33,3 +33,42 @@
  # Only temporary, omit from archive
  rm $PATH_TMP/version-generated.h
  
+--- VirtualBox-3.1.2_OSE/src/VBox/HostDrivers/linux/export_modules.org	2010-01-12 13:08:56.187604615 +0100
++++ VirtualBox-3.1.2_OSE/src/VBox/HostDrivers/linux/export_modules	2010-01-12 13:14:32.244857217 +0100
+@@ -36,6 +36,7 @@
+ PATH_LINUX="$PATH_ROOT/src/VBox/HostDrivers/linux"
+ PATH_VBOXDRV="$PATH_ROOT/src/VBox/HostDrivers/Support"
+ PATH_VBOXNET="$PATH_ROOT/src/VBox/HostDrivers/VBoxNetFlt"
++PATH_VBOXADP="$PATH_ROOT/src/VBox/HostDrivers/VBoxNetAdp"
+ 
+ VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
+ VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
+@@ -44,6 +45,7 @@
+ 
+ . $PATH_VBOXDRV/linux/files_vboxdrv
+ . $PATH_VBOXNET/linux/files_vboxnetflt
++. $PATH_VBOXADP/linux/files_vboxnetadp
+ 
+ # Temporary path for creating the modules, will be removed later
+ mkdir $PATH_TMP || exit 1
+@@ -90,6 +92,20 @@
+     sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
+ fi
+ 
++# vboxnetadp (VirtualBox host-only network kernel module)
++mkdir $PATH_TMP/vboxnetadp || exit 1
++for f in $VBOX_VBOXNETADP_SOURCES; do
++    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxnetadp/`echo $f|cut -d'>' -f2`"
++done
++sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_LINUX/build_in_tmp > $PATH_TMP/vboxnetadp/build_in_tmp
++chmod 0755 $PATH_TMP/vboxnetadp/build_in_tmp
++sed -e "s;_VERSION_;$VBOX_VERSION_STRING;g" < $PATH_VBOXADP/linux/dkms.conf > $PATH_TMP/vboxnetadp/dkms.conf
++if [ -n "$VBOX_WITH_HARDENING" ]; then
++    cat                                   $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
++else
++    sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXADP/linux/Makefile > $PATH_TMP/vboxnetadp/Makefile
++fi
++
+ install -D -m 0644 $PATH_LINUX/Makefile $PATH_TMP/Makefile
+ 
+ # Only temporary, omit from archive
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.251&r2=1.252&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox-export_modules.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list