[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.1.10-dfsg-1-2-g3680e94

[Felix Geyer]

The following commit has been merged in the master branch:
commit 04c9292844e8c35ac762077b587dc7a6837dbbe2
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Apr 1 23:26:29 2012 +0200

    Make the vboxpci module buildable for a i386 kernel when running amd64.
    
    Closes: #664730

diff --git a/debian/changelog b/debian/changelog
index 1996682..62ced79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (4.1.10-dfsg-2) UNRELEASED; urgency=low
+
+  * Make the vboxpci module buildable for a i386 kernel when running amd64.
+    (Closes: #664730)
+    - Update 12-make-module.patch
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 01 Apr 2012 23:23:16 +0200
+
 virtualbox (4.1.10-dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/12-make-module.patch b/debian/patches/12-make-module.patch
index 7a45b50..ead1a9f 100644
--- a/debian/patches/12-make-module.patch
+++ b/debian/patches/12-make-module.patch
@@ -1,10 +1,10 @@
 Description: Fix ARCH setting in modules Makefiles.
 Author: Michael Meskes <meskes at debian.org>
 
-diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Installer/linux/Makefile.include.header virtualbox-ose-3.0.8-dfsg/src/VBox/Installer/linux/Makefile.include.header
---- virtualbox-ose-3.0.8-dfsg~/src/VBox/Installer/linux/Makefile.include.header	2009-10-07 11:27:13.000000000 +0200
-+++ virtualbox-ose-3.0.8-dfsg/src/VBox/Installer/linux/Makefile.include.header	2009-10-07 13:43:30.705472033 +0200
-@@ -33,9 +33,21 @@
+diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/Support/linux/Makefile
+--- a/src/VBox/HostDrivers/Support/linux/Makefile
++++ b/src/VBox/HostDrivers/Support/linux/Makefile
+@@ -44,9 +44,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
    BUILD_TARGET_ARCH := amd64
   else
    ifeq ($(ARCH),i386)
@@ -16,22 +16,22 @@ diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Installer/linux/Makefile.include
 +   endif
    else
 -   BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+    ifeq ($(ARCH),x86)
-+      ifeq ($(CONFIG_X86_32),y)
-+        BUILD_TARGET_ARCH := x86
-+      else
-+        BUILD_TARGET_ARCH := amd64
-+      endif
-+    else
-+      BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+    endif
++   ifeq ($(ARCH),x86)
++     ifeq ($(CONFIG_X86_32),y)
++       BUILD_TARGET_ARCH := x86
++     else
++       BUILD_TARGET_ARCH := amd64
++     endif
++   else
++     BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
++   endif
    endif
   endif
  else
-diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
---- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/Support/linux/Makefile	2009-10-07 11:27:14.000000000 +0200
-+++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/Support/linux/Makefile	2009-10-07 13:43:30.705472033 +0200
-@@ -44,9 +44,21 @@
+diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
++++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+@@ -35,9 +35,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
    BUILD_TARGET_ARCH := amd64
   else
    ifeq ($(ARCH),i386)
@@ -55,10 +55,10 @@ diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/Support/linux/Makefi
    endif
   endif
  else
-diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
---- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile	2009-10-07 11:27:14.000000000 +0200
-+++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile	2009-10-07 13:43:30.705472033 +0200
-@@ -35,9 +35,21 @@
+diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+@@ -35,9 +35,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
    BUILD_TARGET_ARCH := amd64
   else
    ifeq ($(ARCH),i386)
@@ -82,10 +82,10 @@ diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetAdp/linux/Mak
    endif
   endif
  else
-diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
---- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile	2009-10-07 11:27:14.000000000 +0200
-+++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile	2009-10-07 13:43:30.705472033 +0200
-@@ -35,9 +35,21 @@
+diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
+--- a/src/VBox/HostDrivers/VBoxPci/linux/Makefile
++++ b/src/VBox/HostDrivers/VBoxPci/linux/Makefile
+@@ -35,9 +35,21 @@ ifeq ($(BUILD_TARGET_ARCH),)
    BUILD_TARGET_ARCH := amd64
   else
    ifeq ($(ARCH),i386)
@@ -109,3 +109,30 @@ diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetFlt/linux/Mak
    endif
   endif
  else
+diff --git a/src/VBox/Installer/linux/Makefile.include.header b/src/VBox/Installer/linux/Makefile.include.header
+--- a/src/VBox/Installer/linux/Makefile.include.header
++++ b/src/VBox/Installer/linux/Makefile.include.header
+@@ -54,9 +54,21 @@ 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
+-   BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
++    ifeq ($(ARCH),x86)
++      ifeq ($(CONFIG_X86_32),y)
++        BUILD_TARGET_ARCH := x86
++      else
++        BUILD_TARGET_ARCH := amd64
++      endif
++    else
++      BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
++    endif
+   endif
+  endif
+ else

-- 
virtualbox Debian packaging