[Pkg-virtualbox-commits] r394 - virtualbox-ose/trunk/debian/patches

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-27 13:57:21 +0000 (Thu, 27 Nov 2008)
New Revision: 394

Modified:
   virtualbox-ose/trunk/debian/patches/12-make-module.dpatch
Log:
Fix arch detection also in guest-modules Makefiles.


Modified: virtualbox-ose/trunk/debian/patches/12-make-module.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/12-make-module.dpatch	2008-11-25 09:24:04 UTC (rev 393)
+++ virtualbox-ose/trunk/debian/patches/12-make-module.dpatch	2008-11-27 13:57:21 UTC (rev 394)
@@ -1,13 +1,77 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 12-make-module.dpatch by Michael Meskes <meskes at debian.org>
 ##
-## DP: Fix ARCH setting in module Makefile
+## DP: Fix ARCH setting in modules Makefiles
 
 @DPATCH@
 
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.6.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile	2008-04-30 14:05:50.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/HostDrivers/Support/linux/Makefile	2008-05-09 09:31:52.000000000 +0000
+diff -Naurp virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/module/Makefile.module
+--- virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module	2008-11-27 14:45:57.000000000 +0100
++++ virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/module/Makefile.module	2008-11-27 14:50:29.000000000 +0100
+@@ -32,12 +32,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
+   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
+diff -Naurp virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module
+--- virtualbox-ose-2.0.6-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module	2008-11-27 14:45:57.000000000 +0100
++++ virtualbox-ose-2.0.6-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module	2008-11-27 14:51:08.000000000 +0100
+@@ -32,12 +32,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
+   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
+diff -Naurp virtualbox-ose-2.0.6-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-2.0.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
+--- virtualbox-ose-2.0.6-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile	2008-11-27 14:45:45.000000000 +0100
++++ virtualbox-ose-2.0.6-dfsg/src/VBox/HostDrivers/Support/linux/Makefile	2008-11-27 14:49:00.000000000 +0100
 @@ -43,12 +43,24 @@ ifeq ($(BUILD_TARGET_ARCH),)
    BUILD_TARGET_ARCH := amd64
   else