- fix duplicate export of vboxnetadp, which made whole export to fail and spec used...

- reorganize kernel modules build with host/guest drivers more clearly

Changed files:
    VirtualBox-export_modules.patch -> 1.7
    VirtualBox.spec -> 1.294
    export_modules.patch -> 1.1

diff --git a/VirtualBox-export_modules.patch b/VirtualBox-export_modules.patch
index 93653b2ee59d3b385cf7e5e0723d7e3f9f11f659..3f7122601fa639b597eb2c20a9d0ab87b33addfb 100644 (file)
--- a/VirtualBox-export_modules.patch
+++ b/VirtualBox-export_modules.patch
@@ -16,26 +16,3 @@
  # 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
-@@ -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

diff --git a/VirtualBox.spec b/VirtualBox.spec
index d5c4fafd47cc918be78ae1e50d0711e283c1f3c2..c999cc26c07c78d33a9b643a402df89d4159cf87 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -414,11 +414,14 @@ Moduł jądra Linuksa dla VirtualBoksa OSE - sterownik obsługi DRM.
 cp -a %{SOURCE1} .
 sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE8} > VirtualBox-wrapper.sh
 
-rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
-../src/VBox/Additions/linux/export_modules modules.tar.gz
-       tar -zxf modules.tar.gz && rm -f modules.tar.gz
-../src/VBox/HostDrivers/linux/export_modules modules.tar.gz --without-hardening && \
-       tar -zxf modules.tar.gz && rm -f modules.tar.gz
+install -d PLD-MODULE-BUILD/{GuestDrivers,HostDrivers}
+cd PLD-MODULE-BUILD
+../src/VBox/Additions/linux/export_modules guest-modules.tar.gz
+tar -zxf guest-modules.tar.gz -C GuestDrivers
+
+../src/VBox/HostDrivers/linux/export_modules host-modules.tar.gz --without-hardening && \
+tar -zxf host-modules.tar.gz -C HostDrivers
+cd -
 
 %build
 %if %{with userspace}
@@ -433,15 +436,17 @@ kmk -j1 %{?with_verbose:KBUILD_VERBOSE=3} USER=$(id -un)
 %endif
 
 %if %{with kernel}
-cd PLD-MODULE-BUILD
+cd PLD-MODULE-BUILD/HostDrivers
+%build_kernel_modules -m vboxdrv -C vboxdrv
+%build_kernel_modules -m vboxnetadp -C vboxnetadp
+%build_kernel_modules -m vboxnetflt -C vboxnetflt
+
+cd ../GuestDrivers
 %build_kernel_modules -m vboxguest -C vboxguest
-%build_kernel_modules -m vboxdrv -C .vbox_modules/vboxdrv
-%build_kernel_modules -m vboxnetadp -C .vbox_modules/vboxnetadp
-%build_kernel_modules -m vboxnetflt -C .vbox_modules/vboxnetflt
 cp -a vboxguest/Module.symvers vboxsf
 %build_kernel_modules -m vboxsf -C vboxsf -c
 %build_kernel_modules -m vboxvideo -C vboxvideo_drm
-cd ..
+cd ../..
 %{__cc} %{rpmcflags} %{rpmldflags} -Wall -Werror src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c -o mount.vboxsf
 %endif
 
@@ -532,12 +537,12 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxsf
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp
-%install_kernel_modules -m PLD-MODULE-BUILD/.vbox_modules/vboxdrv/vboxdrv -d misc
-%install_kernel_modules -m PLD-MODULE-BUILD/vboxguest/vboxguest -d misc
-%install_kernel_modules -m PLD-MODULE-BUILD/.vbox_modules/vboxnetadp/vboxnetadp -d misc
-%install_kernel_modules -m PLD-MODULE-BUILD/.vbox_modules/vboxnetflt/vboxnetflt -d misc
-%install_kernel_modules -m PLD-MODULE-BUILD/vboxsf/vboxsf -d misc
-%install_kernel_modules -m PLD-MODULE-BUILD/vboxvideo_drm/vboxvideo -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc
+%install_kernel_modules -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo_drm/vboxvideo -d misc
 
 install -p mount.vboxsf $RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf
 

diff --git a/export_modules.patch b/export_modules.patch
new file mode 100644 (file)
index 0000000..5447aa1
--- /dev/null
+++ b/export_modules.patch
@@ -0,0 +1,23 @@
+--- VirtualBox-3.2.6_OSE/src/VBox/HostDrivers/linux/export_modules~    2010-08-02 17:33:03.000000000 +0300
++++ VirtualBox-3.2.6_OSE/src/VBox/HostDrivers/linux/export_modules     2010-08-02 17:35:29.736477562 +0300
+@@ -109,20 +109,6 @@
+     sed -e "s;-DVBOX_WITH_HARDENING;;g" < $PATH_VBOXNET/linux/Makefile > $PATH_TMP/vboxnetflt/Makefile
+ fi
+ 
+-# vboxnetadp (VirtualBox network adapter 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
+-
+ # vboxnetadp (VirtualBox host-only network kernel module)
+ mkdir $PATH_TMP/vboxnetadp || exit 1
+ for f in $VBOX_VBOXNETADP_SOURCES; do