[Pkg-virtualbox-commits] r256 - in trunk/debian: . patches virtualbox-ose-source.files

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-04-25 12:14:59 +0000 (Fri, 25 Apr 2008)
New Revision: 256

Added:
   trunk/debian/patches/13-make-module.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/virtualbox-ose-source.files/rules
Log:
* Rewrote debian/rules for virtuabox-ose-source partially
* Patched module Makefile to allow amd64 build in linux-modules-extra-2.6.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-24 09:54:02 UTC (rev 255)
+++ trunk/debian/changelog	2008-04-25 12:14:59 UTC (rev 256)
@@ -8,6 +8,9 @@
   * Provide xserver-xorg-input-2 and xserver-xorg-video-2 with guest-utils.
   * Removed watch file, I couldn't find a way to get the orig tarball without
     first accepting a license.
+  * Rewrote debian/rules for virtuabox-ose-source partially, hopefully this
+    finally closes: #469882
+  * Patched module Makefile to allow amd64 build in linux-modules-extra-2.6.
 
  -- Michael Meskes <meskes at debian.org>  Wed, 23 Apr 2008 16:56:49 +0200
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-04-24 09:54:02 UTC (rev 255)
+++ trunk/debian/patches/00list	2008-04-25 12:14:59 UTC (rev 256)
@@ -10,3 +10,4 @@
 10-initscript.dpatch
 11-workaround-gcc-ice
 12-gcc-4.3
+13-make-module

Added: trunk/debian/patches/13-make-module.dpatch
===================================================================
--- trunk/debian/patches/13-make-module.dpatch	                        (rev 0)
+++ trunk/debian/patches/13-make-module.dpatch	2008-04-25 12:14:59 UTC (rev 256)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13-make-module.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix ARCH setting in module Makefile
+
+ at DPATCH@
+
+--- virtualbox-ose-1.5.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile.orig	2008-02-19 12:49:05.000000000 +0100
++++ virtualbox-ose-1.5.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile	2008-04-25 11:49:43.000000000 +0200
+@@ -28,12 +28,24 @@
+   BUILD_TARGET_ARCH := amd64
+  else
+   ifeq ($(ARCH),i386)
+-   BUILD_TARGET_ARCH := x86
++   ifeq ($(CONFIG_X86_32),y)
++     BUILD_TARGET_ARCH := x86
++   else
++     BUILD_TARGET_ARCH := amd64
++   endif
+   else
+-   ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
+-    BUILD_TARGET_ARCH := amd64
++   ifeq ($(ARCH),x86)
++    ifeq ($(CONFIG_X86_32),y)
++     BUILD_TARGET_ARCH := x86
++    else
++     BUILD_TARGET_ARCH := amd64
++    endif
+    else
+-    BUILD_TARGET_ARCH := x86
++    ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
++     BUILD_TARGET_ARCH := amd64
++    else
++     BUILD_TARGET_ARCH := x86
++    endif
+    endif
+   endif
+  endif

Modified: trunk/debian/virtualbox-ose-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-source.files/rules	2008-04-24 09:54:02 UTC (rev 255)
+++ trunk/debian/virtualbox-ose-source.files/rules	2008-04-25 12:14:59 UTC (rev 256)
@@ -35,18 +35,6 @@
 # compiler), VERSION (the final package version string), PKGNAME (full
 # package name with KVERS included), DEB_DESTDIR (path to store DEBs)
 
-# Set ARCH so we can cross compile Debian kernel
-ARCH := `uname -m`
-ifneq ($(shell echo $(ARCH) | grep 86), )
-        ARCH := i386
-endif
-ifneq ($(shell echo $(KVERS) | grep 86), )
-	ARCH := i386
-endif
-ifneq ($(shell echo $(KVERS) | grep amd64), )
-	ARCH := x86_64
-endif
-
 # The kdist_configure target is called by make-kpkg modules_config and
 # by kdist* rules by dependency. It should configure the module so it is
 # ready for compilation (mostly useful for calling configure).
@@ -68,7 +56,7 @@
 	dh_clean -k
 
 	# Build the module
-	$(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC) ARCH=$(ARCH)
+	$(MAKE) -C $(KSRC) M=$(CURDIR)
 
 	# Install the module
 	dh_install vboxdrv.ko /lib/modules/$(KVERS)/misc/