[Pkg-virtualbox-commits] r125 - in trunk/debian: . patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2007-12-03 13:15:55 +0000 (Mon, 03 Dec 2007)
New Revision: 125

Added:
   trunk/debian/patches/11-module-build.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Fixed build problem in linux-modules-extra from our side.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-02 17:10:42 UTC (rev 124)
+++ trunk/debian/changelog	2007-12-03 13:15:55 UTC (rev 125)
@@ -1,6 +1,9 @@
 virtualbox-ose (1.5.2-dfsg2-3) unstable; urgency=low
 
   * Added patch to remove registration form, closes: #447626, #453784
+  * Added just another patch to make sure module is build with the correct
+    name when build by linux-modules-extra, closes: #453681, #454123
+  * Patched Makefile for guest modules for the same reason.
 
  -- Michael Meskes <meskes at debian.org>  Sun, 02 Dec 2007 18:06:27 +0100
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-12-02 17:10:42 UTC (rev 124)
+++ trunk/debian/patches/00list	2007-12-03 13:15:55 UTC (rev 125)
@@ -8,4 +8,5 @@
 08-no-kernel.dpatch
 09-quiet-grep.dpatch
 10-no-registration.dpatch
+11-module-build.dpatch
 

Added: trunk/debian/patches/11-module-build.dpatch
===================================================================
--- trunk/debian/patches/11-module-build.dpatch	                        (rev 0)
+++ trunk/debian/patches/11-module-build.dpatch	2007-12-03 13:15:55 UTC (rev 125)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-module-build.dpatch by  <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build module correctly in linux-modules-extra
+
+ at DPATCH@
+
+diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module
+--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/module/Makefile.module	2007-10-18 13:07:28.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.module	2007-12-03 13:35:34.000000000 +0100
+@@ -14,7 +14,7 @@
+ #  be useful, but WITHOUT ANY WARRANTY of any kind.
+ 
+ #
+-MODULE = vboxadd
++override MODULE = vboxadd
+ OBJS   = \
+ 	cmc.o \
+ 	hgcmcall.o \
+diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module
+--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module	2007-10-18 13:07:28.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.module	2007-12-03 13:35:46.000000000 +0100
+@@ -14,7 +14,7 @@
+ #  be useful, but WITHOUT ANY WARRANTY of any kind.
+ 
+ #
+-MODULE = vboxvfs
++override MODULE = vboxvfs
+ OBJS   = \
+ 	vfsmod.o \
+ 	vfs-utils.o \
+diff -ruN virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile
+--- virtualbox-ose-1.5.2-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile	2007-10-18 13:07:28.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile	2007-12-03 13:33:25.000000000 +0100
+@@ -40,7 +40,7 @@
+ endif
+ 
+ 
+-MODULE = vboxdrv
++override MODULE = vboxdrv
+ OBJS   = \
+ 	linux/SUPDrv-linux.o \
+ 	SUPDRVShared.o \