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

Mon Jun 18 01:55:41 UTC 2007

Author: hug
Date: 2007-06-18 01:55:41 +0000 (Mon, 18 Jun 2007)
New Revision: 4

Added:
   dists/trunk/virtualbox/debian/patches/04-host-module.dpatch
Removed:
   dists/trunk/virtualbox/debian/patches/04-kmake-fixes.dpatch
Modified:
   dists/trunk/virtualbox/debian/changelog
   dists/trunk/virtualbox/debian/patches/00list
   dists/trunk/virtualbox/debian/patches/02-kernel.dpatch
   dists/trunk/virtualbox/debian/rules
Log:
* updated patches


Modified: dists/trunk/virtualbox/debian/changelog
===================================================================

--- dists/trunk/virtualbox/debian/changelog	2007-06-18 01:12:13 UTC (rev 3)
+++ dists/trunk/virtualbox/debian/changelog	2007-06-18 01:55:41 UTC (rev 4)
@@ -5,6 +5,7 @@
   * Use Debian's kbuild and yasm instead
   * Added myself as uploader
   * Build target for module is now all instead of module
+  * Build against correct kernel source
 
  -- Philipp Hug <debian at hug.cx>  Sun, 17 Jun 2007 18:13:25 +0100
 

Modified: dists/trunk/virtualbox/debian/patches/00list
===================================================================
--- dists/trunk/virtualbox/debian/patches/00list	2007-06-18 01:12:13 UTC (rev 3)
+++ dists/trunk/virtualbox/debian/patches/00list	2007-06-18 01:55:41 UTC (rev 4)
@@ -1,3 +1,3 @@
+02-kernel.dpatch
 03-configure.dpatch
-04-kmake-fixes.dpatch
-
+04-host-module.dpatch

Modified: dists/trunk/virtualbox/debian/patches/02-kernel.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/02-kernel.dpatch	2007-06-18 01:12:13 UTC (rev 3)
+++ dists/trunk/virtualbox/debian/patches/02-kernel.dpatch	2007-06-18 01:55:41 UTC (rev 4)
@@ -5,15 +5,14 @@
 
 @DPATCH@
 
-diff -Naur virtualbox-20070115.orig/configure virtualbox-20070115/configure
---- virtualbox-20070115.orig/configure	2007-01-15 22:49:48.000000000 +0000
-+++ virtualbox-20070115/configure	2007-01-16 16:12:35.000000000 +0000
-@@ -1103,7 +1103,7 @@
- (($XPCOM==1)) && check_qt
+--- virtualbox.orig/configure	2007-06-18 02:39:50.000000000 +0100
++++ virtualbox/configure	2007-06-18 02:40:00.000000000 +0100
+@@ -1275,7 +1275,7 @@
+ (($WITH_QT==1))       && check_qt
  
  # Linux-specific
 -[ "$OS" = "linux" ] && check_linux
 +#[ "$OS" = "linux" ] && check_linux
+ [ "$OS" = "linux" ] && check_compiler_h
+ [ "$OS" = "linux" -a "$WITH_HAL" = "1" ] && check_libhal
  
- # success!
- echo

Added: dists/trunk/virtualbox/debian/patches/04-host-module.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/04-host-module.dpatch	                        (rev 0)
+++ dists/trunk/virtualbox/debian/patches/04-host-module.dpatch	2007-06-18 01:55:41 UTC (rev 4)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-host-module.dpatch by  <Torsten Werner <twerner at debian.org>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad virtualbox-20070507+debian~/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-20070507+debian/src/VBox/HostDrivers/Support/linux/Makefile
+--- virtualbox-20070507+debian~/src/VBox/HostDrivers/Support/linux/Makefile	2007-05-07 10:54:22.000000000 +0200
++++ virtualbox-20070507+debian/src/VBox/HostDrivers/Support/linux/Makefile	2007-05-07 13:22:58.000000000 +0200
+@@ -65,6 +65,7 @@
+ ifneq ($(MAKECMDGOALS),clean)
+ 
+ # kernel base directory
++KERN_DIR := $(shell pwd)
+ ifndef KERN_DIR
+  KERN_DIR := /lib/modules/$(shell uname -r)/build
+  ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)


Property changes on: dists/trunk/virtualbox/debian/patches/04-host-module.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: dists/trunk/virtualbox/debian/patches/04-kmake-fixes.dpatch
===================================================================
--- dists/trunk/virtualbox/debian/patches/04-kmake-fixes.dpatch	2007-06-18 01:12:13 UTC (rev 3)
+++ dists/trunk/virtualbox/debian/patches/04-kmake-fixes.dpatch	2007-06-18 01:55:41 UTC (rev 4)
@@ -1,39 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 04-kmake-fixes.dpatch by Philipp Hug <debian at hug.cx>
-##
-## DP: Disable linux-header check.
-
- at DPATCH@
-
-diff -ur VirtualBox-OSE-1.4.0/src/VBox/VMM/testcase/tstAsmStructsAsm.asm virtualbox/src/VBox/VMM/testcase/tstAsmStructsAsm.asm
---- VirtualBox-OSE-1.4.0/src/VBox/VMM/testcase/tstAsmStructsAsm.asm	2007-06-06 07:05:48.000000000 +0100
-+++ virtualbox/src/VBox/VMM/testcase/tstAsmStructsAsm.asm	2007-06-17 20:07:29.000000000 +0100
-@@ -26,12 +26,12 @@
- BITS 64
- %endif
- 
--%include "../CPUMInternal.mac"
--%include "../TRPMInternal.mac"
--%include "../VMMInternal.mac"
-+%include "CPUMInternal.mac"
-+%include "TRPMInternal.mac"
-+%include "VMMInternal.mac"
- %include "VBox/cpum.mac"
- %include "VBox/vm.mac"
--%include "../VMMSwitcher/VMMSwitcher.mac"
-+%include "VMMSwitcher/VMMSwitcher.mac"
- %ifdef DO_GLOBALS
-  %include "tstAsmStructsAsm.mac"
- %endif
-diff -ur VirtualBox-OSE-1.4.0/src/VBox/VMM/testcase/tstMicroGCA.asm virtualbox/src/VBox/VMM/testcase/tstMicroGCA.asm
---- VirtualBox-OSE-1.4.0/src/VBox/VMM/testcase/tstMicroGCA.asm	2007-06-06 07:05:48.000000000 +0100
-+++ virtualbox/src/VBox/VMM/testcase/tstMicroGCA.asm	2007-06-17 20:06:08.000000000 +0100
-@@ -27,7 +27,7 @@
- %include "VBox/cpum.mac"
- %include "VBox/err.mac"
- %include "VBox/vm.mac"
--%include "tstMicro.mac"
-+%include "testcase/tstMicro.mac"
- 
- 
- ;*******************************************************************************

Modified: dists/trunk/virtualbox/debian/rules
===================================================================
--- dists/trunk/virtualbox/debian/rules	2007-06-18 01:12:13 UTC (rev 3)
+++ dists/trunk/virtualbox/debian/rules	2007-06-18 01:55:41 UTC (rev 4)
@@ -135,7 +135,7 @@
 	$(MAKE) all KSRC=$(KSRC) KVER=$(KVERS)
 
 	# Install the module
-	install -D -m 0644 vboxdrv.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/misc/vboxdrv.ko
+	dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/
 
 	dh_installdocs
 	dh_installchangelogs


