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

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-11-21 11:08:49 +0000 (Fri, 21 Nov 2008)
New Revision: 374

Added:
   virtualbox-ose/trunk/debian/patches/01-build-arch.dpatch
Removed:
   virtualbox-ose/trunk/debian/patches/01-no-64bit-guest.dpatch
Modified:
   virtualbox-ose/trunk/debian/patches/00list
Log:
Only check build architecture, 64bit guest are allowed with version 2+.



Modified: virtualbox-ose/trunk/debian/patches/00list
===================================================================
--- virtualbox-ose/trunk/debian/patches/00list	2008-11-20 14:55:57 UTC (rev 373)
+++ virtualbox-ose/trunk/debian/patches/00list	2008-11-21 11:08:49 UTC (rev 374)
@@ -1,4 +1,4 @@
-01-no-64bit-guest.dpatch
+01-build-arch.dpatch
 02-config-kmk.dpatch
 03-localconf-kmk.dpatch
 04-vboxdrv-references.dpatch

Copied: virtualbox-ose/trunk/debian/patches/01-build-arch.dpatch (from rev 373, virtualbox-ose/trunk/debian/patches/01-no-64bit-guest.dpatch)
===================================================================
--- virtualbox-ose/trunk/debian/patches/01-build-arch.dpatch	                        (rev 0)
+++ virtualbox-ose/trunk/debian/patches/01-build-arch.dpatch	2008-11-21 11:08:49 UTC (rev 374)
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-build-arch.dpatch by Michael Meskes <meskes at debian.org>
+##
+## DP: Correctly check build architecture.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/configure virtualbox-ose-1.6.0-dfsg/configure
+--- virtualbox-ose-1.6.0-dfsg.orig/configure	2008-04-30 14:06:04.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/configure	2008-05-09 09:23:52.000000000 +0000
+@@ -263,7 +263,7 @@ check_environment()
+       exit 1
+       ;;
+   esac
+-  BUILD_CPU=`uname -m`
++  BUILD_CPU=`dpkg-architecture -qDEB_HOST_GNU_CPU`
+   [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
+   case "$BUILD_CPU" in
+     i[3456789]86|x86|i86pc)


Property changes on: virtualbox-ose/trunk/debian/patches/01-build-arch.dpatch
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   + 

Deleted: virtualbox-ose/trunk/debian/patches/01-no-64bit-guest.dpatch
===================================================================
--- virtualbox-ose/trunk/debian/patches/01-no-64bit-guest.dpatch	2008-11-20 14:55:57 UTC (rev 373)
+++ virtualbox-ose/trunk/debian/patches/01-no-64bit-guest.dpatch	2008-11-21 11:08:49 UTC (rev 374)
@@ -1,32 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-no-64bit-guest.dpatch by Michael Meskes <meskes at debian.org>
-##
-## DP: Do not build guest utils on 64 bit architectures.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/configure virtualbox-ose-1.6.0-dfsg/configure
---- virtualbox-ose-1.6.0-dfsg.orig/configure	2008-04-30 14:06:04.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/configure	2008-05-09 09:23:52.000000000 +0000
-@@ -263,7 +263,7 @@ check_environment()
-       exit 1
-       ;;
-   esac
--  BUILD_CPU=`uname -m`
-+  BUILD_CPU=`dpkg-architecture -qDEB_HOST_GNU_CPU`
-   [ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
-   case "$BUILD_CPU" in
-     i[3456789]86|x86|i86pc)
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk	2008-04-30 14:05:58.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk	2008-05-09 09:23:52.000000000 +0000
-@@ -23,7 +23,9 @@ DEPTH ?= ../../../../..
- SUB_DEPTH = ../..
- include	$(PATH_KBUILD)/subheader.kmk
- 
-+ifeq ($(filter-out x86, $(BUILD_TARGET_ARCH)),)
- PROGRAMS += mountvboxsf
-+endif
- INSTALLS += vboxvfs-mod vboxvfs-sh
- OTHERS.linux += \
- 	$(VBOX_PATH_ADDITIONS)/src/vboxvfs/build_in_tmp \