[Pkg-virtualbox-commits] r270 - in trunk/debian: . patches
daniel at alioth.debian.org
daniel at alioth.debian.org
Fri May 9 09:35:23 UTC 2008
Author: daniel
Date: 2008-05-09 09:35:22 +0000 (Fri, 09 May 2008)
New Revision: 270
Added:
trunk/debian/patches/02-config-kmk.dpatch
trunk/debian/patches/03-localconf-kmk.dpatch
trunk/debian/patches/04-vboxdrv-references.dpatch
trunk/debian/patches/05-vboxadd-udev.dpatch
trunk/debian/patches/06-xsession.dpatch
trunk/debian/patches/07-init-fail.dpatch
trunk/debian/patches/08-init-lsb.dpatch
trunk/debian/patches/09-initscript.dpatch
trunk/debian/patches/10-workaround-gcc-ice.dpatch
trunk/debian/patches/11-gcc-4.3.dpatch
trunk/debian/patches/12-make-module.dpatch
Removed:
trunk/debian/patches/03-config-kmk.dpatch
trunk/debian/patches/04-localconf-kmk.dpatch
trunk/debian/patches/05-vboxdrv-references.dpatch
trunk/debian/patches/06-vboxadd-udev.dpatch
trunk/debian/patches/07-xsession.dpatch
trunk/debian/patches/08-init-fail.dpatch
trunk/debian/patches/09-init-lsb.dpatch
trunk/debian/patches/10-initscript.dpatch
trunk/debian/patches/11-workaround-gcc-ice.dpatch
trunk/debian/patches/12-gcc-4.3.dpatch
trunk/debian/patches/13-make-module.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
Log:
Renumbering all patches.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/changelog 2008-05-09 09:35:22 UTC (rev 270)
@@ -24,6 +24,7 @@
* Removing some reimported useless whitespaces.
* Removing ffmpeg recursively in dfsg-free target in rules.
* Rediffing all patches.
+ * Renumbering all patches.
-- Michael Meskes <meskes at debian.org> Fri, 02 May 2008 10:14:01 +0200
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/00list 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,12 +1,12 @@
01-no-64bit-guest.dpatch
-03-config-kmk.dpatch
-04-localconf-kmk.dpatch
-05-vboxdrv-references.dpatch
-06-vboxadd-udev.dpatch
-07-xsession.dpatch
-08-init-fail.dpatch
-09-init-lsb.dpatch
-10-initscript.dpatch
-11-workaround-gcc-ice
-12-gcc-4.3
-13-make-module
+02-config-kmk.dpatch
+03-localconf-kmk.dpatch
+04-vboxdrv-references.dpatch
+05-vboxadd-udev.dpatch
+06-xsession.dpatch
+07-init-fail.dpatch
+08-init-lsb.dpatch
+09-initscript.dpatch
+10-workaround-gcc-ice
+11-gcc-4.3
+12-make-module
Copied: trunk/debian/patches/02-config-kmk.dpatch (from rev 269, trunk/debian/patches/03-config-kmk.dpatch)
===================================================================
--- trunk/debian/patches/02-config-kmk.dpatch (rev 0)
+++ trunk/debian/patches/02-config-kmk.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,29 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 03-config-kmk.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+##
+## DP: Some patches for Config.kmk to build with the debian tools
+## DP: XPCOM setup for all but win32.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/Config.kmk virtualbox-ose-1.6.0-dfsg/Config.kmk
+--- virtualbox-ose-1.6.0-dfsg.orig/Config.kmk 2008-04-30 20:06:49.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/Config.kmk 2008-05-09 09:24:39.000000000 +0000
+@@ -970,7 +970,7 @@ VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$
+ # We need to export YASM for OSE, but since it was converted to .zip we need to
+ # allow for the location used by the zip to be properly cleaned up first.
+ if1of ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH), win.x86 linux.x86 solaris.x86)
+- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
++ PATH_TOOL_YASM ?= /usr/bin
+ endif
+
+ # XPCOM setup for all but win32.
+@@ -1456,7 +1456,7 @@ if1of ($(BUILD_TARGET), linux)
+ kernelsrc := $(shell $(SED_EXT) -ne 's+^KERNELSRC.*= *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
+ ifneq ($(kernelsrc),)
+ kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
+- VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
++ VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 /usr/include
+ else
+ kernelpath := $(VBOX_LINUX_SRC)
+ endif
Deleted: trunk/debian/patches/03-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/03-config-kmk.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/03-config-kmk.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,29 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-config-kmk.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
-##
-## DP: Some patches for Config.kmk to build with the debian tools
-## DP: XPCOM setup for all but win32.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/Config.kmk virtualbox-ose-1.6.0-dfsg/Config.kmk
---- virtualbox-ose-1.6.0-dfsg.orig/Config.kmk 2008-04-30 20:06:49.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/Config.kmk 2008-05-09 09:24:39.000000000 +0000
-@@ -970,7 +970,7 @@ VBOX_PATH_DIFX ?= $(PATH_DEVTOOLS)/win.$
- # We need to export YASM for OSE, but since it was converted to .zip we need to
- # allow for the location used by the zip to be properly cleaned up first.
- if1of ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH), win.x86 linux.x86 solaris.x86)
-- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
-+ PATH_TOOL_YASM ?= /usr/bin
- endif
-
- # XPCOM setup for all but win32.
-@@ -1456,7 +1456,7 @@ if1of ($(BUILD_TARGET), linux)
- kernelsrc := $(shell $(SED_EXT) -ne 's+^KERNELSRC.*= *\(.*\)+\1+p' $(VBOX_LINUX_SRC)/Makefile)
- ifneq ($(kernelsrc),)
- kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
-- VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
-+ VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 /usr/include
- else
- kernelpath := $(VBOX_LINUX_SRC)
- endif
Copied: trunk/debian/patches/03-localconf-kmk.dpatch (from rev 269, trunk/debian/patches/04-localconf-kmk.dpatch)
===================================================================
--- trunk/debian/patches/03-localconf-kmk.dpatch (rev 0)
+++ trunk/debian/patches/03-localconf-kmk.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,25 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 04-localconf-kmk.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+## expanded my Michael Meskes <meskes at debian.org> to set paths
+##
+## DP: Don't build the module for testing and don't build any guest additions.
+## DP: both depends on kernel headers, which are not available atm.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/LocalConfig.kmk virtualbox-ose-1.6.0-dfsg/LocalConfig.kmk
+--- virtualbox-ose-1.6.0-dfsg.orig/LocalConfig.kmk 1970-01-01 00:00:00.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/LocalConfig.kmk 2008-05-09 09:25:16.000000000 +0000
+@@ -0,0 +1,12 @@
++VBOX_WITH_ADDITION_DRIVERS =
++VBOX_ADDITIONS_LINUX_ONLY =
++VBOX_WITH_INSTALLER = 1
++VBOX_WITH_LINUX_ADDITIONS = 1
++VBOX_WITH_TESTCASES =
++VBOX_WITH_TESTSUITE =
++VBOX_WITH_USB =
++VBOX_WITH_REGISTRATION_REQUEST =
++DEFS += RTPATH_APP_DOCS=\"/usr/share/doc/virtualbox\"
++DEFS += RTPATH_APP_PRIVATE_ARCH=\"/usr/lib/virtualbox\"
++DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
++DEFS += RTPATH_SHARED_LIBS=\"/usr/lib/virtualbox\"
Deleted: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/04-localconf-kmk.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,25 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 04-localconf-kmk.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
-## expanded my Michael Meskes <meskes at debian.org> to set paths
-##
-## DP: Don't build the module for testing and don't build any guest additions.
-## DP: both depends on kernel headers, which are not available atm.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/LocalConfig.kmk virtualbox-ose-1.6.0-dfsg/LocalConfig.kmk
---- virtualbox-ose-1.6.0-dfsg.orig/LocalConfig.kmk 1970-01-01 00:00:00.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/LocalConfig.kmk 2008-05-09 09:25:16.000000000 +0000
-@@ -0,0 +1,12 @@
-+VBOX_WITH_ADDITION_DRIVERS =
-+VBOX_ADDITIONS_LINUX_ONLY =
-+VBOX_WITH_INSTALLER = 1
-+VBOX_WITH_LINUX_ADDITIONS = 1
-+VBOX_WITH_TESTCASES =
-+VBOX_WITH_TESTSUITE =
-+VBOX_WITH_USB =
-+VBOX_WITH_REGISTRATION_REQUEST =
-+DEFS += RTPATH_APP_DOCS=\"/usr/share/doc/virtualbox\"
-+DEFS += RTPATH_APP_PRIVATE_ARCH=\"/usr/lib/virtualbox\"
-+DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
-+DEFS += RTPATH_SHARED_LIBS=\"/usr/lib/virtualbox\"
Copied: trunk/debian/patches/04-vboxdrv-references.dpatch (from rev 269, trunk/debian/patches/05-vboxdrv-references.dpatch)
===================================================================
--- trunk/debian/patches/04-vboxdrv-references.dpatch (rev 0)
+++ trunk/debian/patches/04-vboxdrv-references.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,37 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 05-vboxdrv-references.dpatch by Daniel Hahler <ubuntu at thequod.de>
+##
+## DP: Change error messages for vboxdrv failure, according to
+## DP: virtualbox-ose-modules.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp 2008-04-30 14:05:26.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp 2008-05-09 09:25:54.000000000 +0000
+@@ -257,10 +257,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
+ {
+ case VERR_VM_DRIVER_LOAD_ERROR:
+ #ifdef RT_OS_LINUX
+- pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
+- "was either not loaded or /dev/vboxdrv is not set up properly. "
+- "Re-setup the kernel module by executing "
+- "'/etc/init.d/vboxdrv setup' as root");
++ pszError = N_("Please install the virtualbox-ose-modules package for your "
++ "kernel and execute 'modprobe vboxdrv' as root");
+ #else
+ pszError = N_("VirtualBox kernel driver not loaded");
+ #endif
+@@ -280,10 +278,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
+ break;
+ case VERR_VM_DRIVER_NOT_INSTALLED:
+ #ifdef RT_OS_LINUX
+- pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
+- "was either not loaded or /dev/vboxdrv was not created for some "
+- "reason. Re-setup the kernel module by executing "
+- "'/etc/init.d/vboxdrv setup' as root");
++ pszError = N_("Please install the virtualbox-ose-modules package for your "
++ "kernel and execute 'modprobe vboxdrv' as root");
+ #else
+ pszError = N_("VirtualBox kernel driver not installed");
+ #endif
Copied: trunk/debian/patches/05-vboxadd-udev.dpatch (from rev 269, trunk/debian/patches/06-vboxadd-udev.dpatch)
===================================================================
--- trunk/debian/patches/05-vboxadd-udev.dpatch (rev 0)
+++ trunk/debian/patches/05-vboxadd-udev.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,89 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 06-vboxadd-udev.dpatch by Michael Meskes <meskes at debian.org>
+## basic idea taken from http://blino.org/blog/mandriva/kernel
+##
+## DP: Make vboxadd module register /dev/vboxadd correctly.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c 2008-04-30 14:05:58.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2008-05-09 09:26:26.000000000 +0000
+@@ -71,6 +71,7 @@ do { \
+ #include <VBox/VBoxDev.h>
+ #include <iprt/asm.h>
+ #include <iprt/assert.h>
++#include <linux/miscdevice.h>
+
+ #define xstr(s) str(s)
+ #define str(s) #s
+@@ -582,6 +583,13 @@ static struct file_operations vbox_fops
+ .llseek = no_llseek
+ };
+
++static struct miscdevice vbox_dev =
++{
++ minor: MISC_DYNAMIC_MINOR,
++ name: "vboxadd",
++ fops: &vbox_fops,
++};
++
+ #ifndef IRQ_RETVAL
+ /* interrupt handlers in 2.4 kernels don't return anything */
+ # define irqreturn_t void
+@@ -851,17 +859,22 @@ static __init int init(void)
+ LogRel(("Starting VirtualBox version %s Guest Additions\n",
+ VBOX_VERSION_STRING));
+ /* register a character device */
+- err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
+- if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
++ if (vbox_major > 0)
+ {
+- LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
+- vbox_major, err));
+- PCI_DEV_PUT(pcidev);
+- return -ENODEV;
++ err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
++ if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
++ {
++ LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
++ vbox_major, err));
++ PCI_DEV_PUT(pcidev);
++ return -ENODEV;
++ }
++ /* if no major code was set, take the return value */
++ if (!vbox_major)
++ vbox_major = err;
+ }
+- /* if no major code was set, take the return value */
+- if (!vbox_major)
+- vbox_major = err;
++ else
++ err = misc_register(&vbox_dev);
+
+ /* allocate and initialize device extension */
+ vboxDev = kmalloc(sizeof(*vboxDev), GFP_KERNEL);
+@@ -1029,7 +1042,10 @@ static __init int init(void)
+ fail:
+ PCI_DEV_PUT(pcidev);
+ free_resources();
+- unregister_chrdev(vbox_major, "vboxadd");
++ if (vbox_major > 0)
++ unregister_chrdev(vbox_major, "vboxadd");
++ else
++ misc_deregister(&vbox_dev);
+ return err;
+ }
+
+@@ -1039,7 +1055,10 @@ fail:
+ */
+ static __exit void fini(void)
+ {
+- unregister_chrdev(vbox_major, "vboxadd");
++ if (vbox_major > 0)
++ unregister_chrdev(vbox_major, "vboxadd");
++ else
++ misc_deregister(&vbox_dev);
+ free_resources();
+ vboxadd_cmc_fini ();
+ }
Deleted: trunk/debian/patches/05-vboxdrv-references.dpatch
===================================================================
--- trunk/debian/patches/05-vboxdrv-references.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/05-vboxdrv-references.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,37 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 05-vboxdrv-references.dpatch by Daniel Hahler <ubuntu at thequod.de>
-##
-## DP: Change error messages for vboxdrv failure, according to
-## DP: virtualbox-ose-modules.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/VMM/VM.cpp 2008-04-30 14:05:26.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/VMM/VM.cpp 2008-05-09 09:25:54.000000000 +0000
-@@ -257,10 +257,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
- {
- case VERR_VM_DRIVER_LOAD_ERROR:
- #ifdef RT_OS_LINUX
-- pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
-- "was either not loaded or /dev/vboxdrv is not set up properly. "
-- "Re-setup the kernel module by executing "
-- "'/etc/init.d/vboxdrv setup' as root");
-+ pszError = N_("Please install the virtualbox-ose-modules package for your "
-+ "kernel and execute 'modprobe vboxdrv' as root");
- #else
- pszError = N_("VirtualBox kernel driver not loaded");
- #endif
-@@ -280,10 +278,8 @@ VMR3DECL(int) VMR3Create(PFNVMATERROR
- break;
- case VERR_VM_DRIVER_NOT_INSTALLED:
- #ifdef RT_OS_LINUX
-- pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
-- "was either not loaded or /dev/vboxdrv was not created for some "
-- "reason. Re-setup the kernel module by executing "
-- "'/etc/init.d/vboxdrv setup' as root");
-+ pszError = N_("Please install the virtualbox-ose-modules package for your "
-+ "kernel and execute 'modprobe vboxdrv' as root");
- #else
- pszError = N_("VirtualBox kernel driver not installed");
- #endif
Deleted: trunk/debian/patches/06-vboxadd-udev.dpatch
===================================================================
--- trunk/debian/patches/06-vboxadd-udev.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/06-vboxadd-udev.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,89 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 06-vboxadd-udev.dpatch by Michael Meskes <meskes at debian.org>
-## basic idea taken from http://blino.org/blog/mandriva/kernel
-##
-## DP: Make vboxadd module register /dev/vboxadd correctly.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/linux/module/vboxmod.c 2008-04-30 14:05:58.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/linux/module/vboxmod.c 2008-05-09 09:26:26.000000000 +0000
-@@ -71,6 +71,7 @@ do { \
- #include <VBox/VBoxDev.h>
- #include <iprt/asm.h>
- #include <iprt/assert.h>
-+#include <linux/miscdevice.h>
-
- #define xstr(s) str(s)
- #define str(s) #s
-@@ -582,6 +583,13 @@ static struct file_operations vbox_fops
- .llseek = no_llseek
- };
-
-+static struct miscdevice vbox_dev =
-+{
-+ minor: MISC_DYNAMIC_MINOR,
-+ name: "vboxadd",
-+ fops: &vbox_fops,
-+};
-+
- #ifndef IRQ_RETVAL
- /* interrupt handlers in 2.4 kernels don't return anything */
- # define irqreturn_t void
-@@ -851,17 +859,22 @@ static __init int init(void)
- LogRel(("Starting VirtualBox version %s Guest Additions\n",
- VBOX_VERSION_STRING));
- /* register a character device */
-- err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
-- if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
-+ if (vbox_major > 0)
- {
-- LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
-- vbox_major, err));
-- PCI_DEV_PUT(pcidev);
-- return -ENODEV;
-+ err = register_chrdev(vbox_major, "vboxadd", &vbox_fops);
-+ if (err < 0 || ((vbox_major & err) || (!vbox_major && !err)))
-+ {
-+ LogRelFunc(("register_chrdev failed: vbox_major: %d, err = %d\n",
-+ vbox_major, err));
-+ PCI_DEV_PUT(pcidev);
-+ return -ENODEV;
-+ }
-+ /* if no major code was set, take the return value */
-+ if (!vbox_major)
-+ vbox_major = err;
- }
-- /* if no major code was set, take the return value */
-- if (!vbox_major)
-- vbox_major = err;
-+ else
-+ err = misc_register(&vbox_dev);
-
- /* allocate and initialize device extension */
- vboxDev = kmalloc(sizeof(*vboxDev), GFP_KERNEL);
-@@ -1029,7 +1042,10 @@ static __init int init(void)
- fail:
- PCI_DEV_PUT(pcidev);
- free_resources();
-- unregister_chrdev(vbox_major, "vboxadd");
-+ if (vbox_major > 0)
-+ unregister_chrdev(vbox_major, "vboxadd");
-+ else
-+ misc_deregister(&vbox_dev);
- return err;
- }
-
-@@ -1039,7 +1055,10 @@ fail:
- */
- static __exit void fini(void)
- {
-- unregister_chrdev(vbox_major, "vboxadd");
-+ if (vbox_major > 0)
-+ unregister_chrdev(vbox_major, "vboxadd");
-+ else
-+ misc_deregister(&vbox_dev);
- free_resources();
- vboxadd_cmc_fini ();
- }
Copied: trunk/debian/patches/06-xsession.dpatch (from rev 269, trunk/debian/patches/07-xsession.dpatch)
===================================================================
--- trunk/debian/patches/06-xsession.dpatch (rev 0)
+++ trunk/debian/patches/06-xsession.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,17 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 07-xsession.dpatch by Michael Meskes <meskes at debian.org>
+##
+## DP: Create a start script in Xsession.d.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-04-30 14:05:59.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-05-09 09:26:59.000000000 +0000
+@@ -17,5 +17,5 @@
+ # additional information or have any questions.
+ #
+
+-/usr/bin/VBoxClient
++/usr/bin/VBoxClient || true
+
Copied: trunk/debian/patches/07-init-fail.dpatch (from rev 269, trunk/debian/patches/08-init-fail.dpatch)
===================================================================
--- trunk/debian/patches/07-init-fail.dpatch (rev 0)
+++ trunk/debian/patches/07-init-fail.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08-init-fail.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix some failures in init script.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-04-30 14:05:52.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
+@@ -49,6 +49,7 @@ fi
+ if [ -z "$NOLSB" ]; then
+ . /lib/lsb/init-functions
+ fail_msg() {
++ [ -f "$VARFILE" ] && rm $VARFILE
+ echo ""
+ log_failure_msg "$1"
+ }
Deleted: trunk/debian/patches/07-xsession.dpatch
===================================================================
--- trunk/debian/patches/07-xsession.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/07-xsession.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,17 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 07-xsession.dpatch by Michael Meskes <meskes at debian.org>
-##
-## DP: Create a start script in Xsession.d.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-04-30 14:05:59.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Additions/x11/installer/98vboxadd-xclient 2008-05-09 09:26:59.000000000 +0000
-@@ -17,5 +17,5 @@
- # additional information or have any questions.
- #
-
--/usr/bin/VBoxClient
-+/usr/bin/VBoxClient || true
-
Deleted: trunk/debian/patches/08-init-fail.dpatch
===================================================================
--- trunk/debian/patches/08-init-fail.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/08-init-fail.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08-init-fail.dpatch by Michael Meskes <meskes at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix some failures in init script.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-04-30 14:05:52.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
-@@ -49,6 +49,7 @@ fi
- if [ -z "$NOLSB" ]; then
- . /lib/lsb/init-functions
- fail_msg() {
-+ [ -f "$VARFILE" ] && rm $VARFILE
- echo ""
- log_failure_msg "$1"
- }
Copied: trunk/debian/patches/08-init-lsb.dpatch (from rev 269, trunk/debian/patches/09-init-lsb.dpatch)
===================================================================
--- trunk/debian/patches/08-init-lsb.dpatch (rev 0)
+++ trunk/debian/patches/08-init-lsb.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09-init-lsb.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make initscript lsb cmpliant.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
+@@ -20,10 +20,10 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides: vboxnet
+-# Required-Start: $network
+-# Required-Stop:
+-# Default-Start: 3 5
+-# Default-Stop:
++# Required-Start: $remote_fs $network
++# Required-Stop: $remote_fs
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
+ # Description: VirtualBox permanent host networking setup
+ ### END INIT INFO
+
+@@ -50,14 +50,13 @@ if [ -z "$NOLSB" ]; then
+ . /lib/lsb/init-functions
+ fail_msg() {
+ [ -f "$VARFILE" ] && rm $VARFILE
+- echo ""
+- log_failure_msg "$1"
++ log_action_end_msg 1
+ }
+ succ_msg() {
+- log_success_msg " done."
++ log_action_end_msg 0
+ }
+ begin_msg() {
+- log_daemon_msg "$@"
++ log_action_begin_msg $1
+ }
+ else
+ if [ "$system" = "redhat" ]; then
Deleted: trunk/debian/patches/09-init-lsb.dpatch
===================================================================
--- trunk/debian/patches/09-init-lsb.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/09-init-lsb.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09-init-lsb.dpatch by Michael Meskes <meskes at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make initscript lsb cmpliant.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:11.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
-@@ -20,10 +20,10 @@
- #
- ### BEGIN INIT INFO
- # Provides: vboxnet
--# Required-Start: $network
--# Required-Stop:
--# Default-Start: 3 5
--# Default-Stop:
-+# Required-Start: $remote_fs $network
-+# Required-Stop: $remote_fs
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
- # Description: VirtualBox permanent host networking setup
- ### END INIT INFO
-
-@@ -50,14 +50,13 @@ if [ -z "$NOLSB" ]; then
- . /lib/lsb/init-functions
- fail_msg() {
- [ -f "$VARFILE" ] && rm $VARFILE
-- echo ""
-- log_failure_msg "$1"
-+ log_action_end_msg 1
- }
- succ_msg() {
-- log_success_msg " done."
-+ log_action_end_msg 0
- }
- begin_msg() {
-- log_daemon_msg "$@"
-+ log_action_begin_msg $1
- }
- else
- if [ "$system" = "redhat" ]; then
Copied: trunk/debian/patches/09-initscript.dpatch (from rev 269, trunk/debian/patches/10-initscript.dpatch)
===================================================================
--- trunk/debian/patches/09-initscript.dpatch (rev 0)
+++ trunk/debian/patches/09-initscript.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,83 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-initscript.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Some changes to initscript.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:29:40.000000000 +0000
+@@ -34,6 +34,11 @@ VARFILE="/var/run/VirtualBox/vboxnet"
+ TAPDEV="/dev/net/tun"
+ NOLSB=%NOLSB%
+
++# Include virtualbox-ose defaults if available
++if [ -f /etc/default/virtualbox-ose ] ; then
++ . /etc/default/virtualbox-ose
++fi
++
+ [ -f /lib/lsb/init-functions ] || NOLSB=yes
+
+ if [ -n "$NOLSB" ]; then
+@@ -162,13 +167,6 @@ start_network()
+ if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then
+ failure "VBoxTunctl not found"
+ fi
+- # Fail if we don't have the kernel tun device
+- # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
+- modprobe tun > /dev/null 2>&1
+- if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null; then
+- failure "Linux tun/tap subsystem not available"
+- fi
+- succ_msg
+ # Read the configuration file entries line by line and create the
+ # interfaces
+ while read line; do
+@@ -179,6 +177,19 @@ start_network()
+ # or two non-comment entries, possibly followed by a comment).
+ if ((! expr match "$2" "#" > /dev/null) &&
+ (test -z "$4" || expr match "$4" "#" > /dev/null)); then
++ if [ "$module_available" != 1 ]
++ then
++ # Fail if we don't have the kernel tun device
++ # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
++ # We only test this once, but we have to do it here, because otherwise an empty
++ # configuration file would trigger the modprobe too.
++ modprobe tun > /dev/null 2>&1
++ if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null
++ then
++ failure "Linux tun/tap subsystem not available"
++ fi
++ module_available=1
++ fi
+ # As the very first thing, try delete the interface. Might already
+ # exist with different configuration. Ignore errors.
+ VBoxTunctl -d $1 > /dev/null 2>&1
+@@ -234,6 +245,7 @@ start_network()
+ chgrp vboxusers "$TAPDEV"
+ chmod 0660 "$TAPDEV"
+ fi
++ succ_msg
+ return 0
+ }
+
+@@ -327,10 +339,17 @@ force_stop_network()
+
+ case "$1" in
+ start)
++ # try to insert module but do not fail if not possible
++ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
++ /sbin/modprobe -q vboxdrv || true
++ fi
+ start_network
+ ;;
+ stop)
+ stop_network
++ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
++ /sbin/modprobe -qr vboxdrv || true
++ fi
+ ;;
+ restart|reload)
+ stop_network && start_network
Deleted: trunk/debian/patches/10-initscript.dpatch
===================================================================
--- trunk/debian/patches/10-initscript.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/10-initscript.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,83 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-initscript.dpatch by Michael Meskes <meskes at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some changes to initscript.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:28:41.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Installer/linux/vboxnet.sh.in 2008-05-09 09:29:40.000000000 +0000
-@@ -34,6 +34,11 @@ VARFILE="/var/run/VirtualBox/vboxnet"
- TAPDEV="/dev/net/tun"
- NOLSB=%NOLSB%
-
-+# Include virtualbox-ose defaults if available
-+if [ -f /etc/default/virtualbox-ose ] ; then
-+ . /etc/default/virtualbox-ose
-+fi
-+
- [ -f /lib/lsb/init-functions ] || NOLSB=yes
-
- if [ -n "$NOLSB" ]; then
-@@ -162,13 +167,6 @@ start_network()
- if ! VBoxTunctl -h 2>&1 | grep VBoxTunctl > /dev/null; then
- failure "VBoxTunctl not found"
- fi
-- # Fail if we don't have the kernel tun device
-- # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
-- modprobe tun > /dev/null 2>&1
-- if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null; then
-- failure "Linux tun/tap subsystem not available"
-- fi
-- succ_msg
- # Read the configuration file entries line by line and create the
- # interfaces
- while read line; do
-@@ -179,6 +177,19 @@ start_network()
- # or two non-comment entries, possibly followed by a comment).
- if ((! expr match "$2" "#" > /dev/null) &&
- (test -z "$4" || expr match "$4" "#" > /dev/null)); then
-+ if [ "$module_available" != 1 ]
-+ then
-+ # Fail if we don't have the kernel tun device
-+ # Make sure that the tun module is loaded (Ubuntu 7.10 needs this)
-+ # We only test this once, but we have to do it here, because otherwise an empty
-+ # configuration file would trigger the modprobe too.
-+ modprobe tun > /dev/null 2>&1
-+ if ! cat /proc/misc 2>/dev/null | grep tun > /dev/null
-+ then
-+ failure "Linux tun/tap subsystem not available"
-+ fi
-+ module_available=1
-+ fi
- # As the very first thing, try delete the interface. Might already
- # exist with different configuration. Ignore errors.
- VBoxTunctl -d $1 > /dev/null 2>&1
-@@ -234,6 +245,7 @@ start_network()
- chgrp vboxusers "$TAPDEV"
- chmod 0660 "$TAPDEV"
- fi
-+ succ_msg
- return 0
- }
-
-@@ -327,10 +339,17 @@ force_stop_network()
-
- case "$1" in
- start)
-+ # try to insert module but do not fail if not possible
-+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
-+ /sbin/modprobe -q vboxdrv || true
-+ fi
- start_network
- ;;
- stop)
- stop_network
-+ if [ "$LOAD_VBOXDRV_MODULE" = 1 ]; then
-+ /sbin/modprobe -qr vboxdrv || true
-+ fi
- ;;
- restart|reload)
- stop_network && start_network
Copied: trunk/debian/patches/10-workaround-gcc-ice.dpatch (from rev 269, trunk/debian/patches/11-workaround-gcc-ice.dpatch)
===================================================================
--- trunk/debian/patches/10-workaround-gcc-ice.dpatch (rev 0)
+++ trunk/debian/patches/10-workaround-gcc-ice.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-workaround-gcc-ice.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use -O3 wot workaround gcc-4.3 problem
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Makefile.kmk virtualbox-ose-1.6.0-dfsg/src/recompiler/Makefile.kmk
+--- virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Makefile.kmk 2008-04-30 14:05:15.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/recompiler/Makefile.kmk 2008-05-09 09:30:23.000000000 +0000
+@@ -225,9 +225,9 @@ endif # !REM_USE_NOCRT
+
+ # Extra flags for these source modules.
+ target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls
+-target-i386/op.c_CFLAGS.x86 = -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2
++target-i386/op.c_CFLAGS.x86 = -O3 -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2
+ target-i386/op.c_CFLAGS.darwin.x86 = -m128bit-long-double -mpreferred-stack-boundary=4
+-target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
++target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
+ cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
+ cpu-exec.c_CFLAGS.solaris.amd64 = -O2 -fomit-frame-pointer -fno-strict-aliasing
+
Copied: trunk/debian/patches/11-gcc-4.3.dpatch (from rev 269, trunk/debian/patches/12-gcc-4.3.dpatch)
===================================================================
--- trunk/debian/patches/11-gcc-4.3.dpatch (rev 0)
+++ trunk/debian/patches/11-gcc-4.3.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-gcc-4.3.dpatch by Michael Meskes <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Some changes needed by gcc-4.3
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-04-30 14:05:33.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-05-09 09:31:08.000000000 +0000
+@@ -33,6 +33,8 @@
+ #include "VBoxRegistrationDlg.h"
+ #endif
+
++#include <stdlib.h>
++
+ #include <qapplication.h>
+ #include <qmessagebox.h>
+ #include <qpixmap.h>
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Main/VMMDevInterface.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp
+--- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Main/VMMDevInterface.cpp 2008-04-30 14:05:49.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp 2008-05-09 09:31:08.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <VBox/VBoxGuest.h>
+ #include <VBox/shflsvc.h>
+ #include <iprt/asm.h>
++#include <stdio.h>
+
+ #ifdef VBOX_HGCM
+ #include "hgcm/HGCM.h"
+diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Sun/op-validate.sed virtualbox-ose-1.6.0-dfsg/src/recompiler/Sun/op-validate.sed
+--- virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Sun/op-validate.sed 2008-04-30 14:05:14.000000000 +0000
++++ virtualbox-ose-1.6.0-dfsg/src/recompiler/Sun/op-validate.sed 2008-05-09 09:31:08.000000000 +0000
+@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan
+ /\.Lfe[0-9][0-9]*:/d
+ /\.LFE[0-9][0-9]*:/d
+ /size[[:space:]]/d
++/p2align[[:space:]]/d
++/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d
+ /^[/#]NO_APP[[:space:]]*$/d
+ /^$/!b bad
+ b end
Deleted: trunk/debian/patches/11-workaround-gcc-ice.dpatch
===================================================================
--- trunk/debian/patches/11-workaround-gcc-ice.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/11-workaround-gcc-ice.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11-workaround-gcc-ice.dpatch by Michael Meskes <meskes at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use -O3 wot workaround gcc-4.3 problem
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Makefile.kmk virtualbox-ose-1.6.0-dfsg/src/recompiler/Makefile.kmk
---- virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Makefile.kmk 2008-04-30 14:05:15.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/recompiler/Makefile.kmk 2008-05-09 09:30:23.000000000 +0000
-@@ -225,9 +225,9 @@ endif # !REM_USE_NOCRT
-
- # Extra flags for these source modules.
- target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls
--target-i386/op.c_CFLAGS.x86 = -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2
-+target-i386/op.c_CFLAGS.x86 = -O3 -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2
- target-i386/op.c_CFLAGS.darwin.x86 = -m128bit-long-double -mpreferred-stack-boundary=4
--target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
-+target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
- cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse
- cpu-exec.c_CFLAGS.solaris.amd64 = -O2 -fomit-frame-pointer -fno-strict-aliasing
-
Deleted: trunk/debian/patches/12-gcc-4.3.dpatch
===================================================================
--- trunk/debian/patches/12-gcc-4.3.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/12-gcc-4.3.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12-gcc-4.3.dpatch by Michael Meskes <meskes at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some changes needed by gcc-4.3
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-04-30 14:05:33.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-05-09 09:31:08.000000000 +0000
-@@ -33,6 +33,8 @@
- #include "VBoxRegistrationDlg.h"
- #endif
-
-+#include <stdlib.h>
-+
- #include <qapplication.h>
- #include <qmessagebox.h>
- #include <qpixmap.h>
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Main/VMMDevInterface.cpp virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp
---- virtualbox-ose-1.6.0-dfsg.orig/src/VBox/Main/VMMDevInterface.cpp 2008-04-30 14:05:49.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/VBox/Main/VMMDevInterface.cpp 2008-05-09 09:31:08.000000000 +0000
-@@ -31,6 +31,7 @@
- #include <VBox/VBoxGuest.h>
- #include <VBox/shflsvc.h>
- #include <iprt/asm.h>
-+#include <stdio.h>
-
- #ifdef VBOX_HGCM
- #include "hgcm/HGCM.h"
-diff -Naurp virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Sun/op-validate.sed virtualbox-ose-1.6.0-dfsg/src/recompiler/Sun/op-validate.sed
---- virtualbox-ose-1.6.0-dfsg.orig/src/recompiler/Sun/op-validate.sed 2008-04-30 14:05:14.000000000 +0000
-+++ virtualbox-ose-1.6.0-dfsg/src/recompiler/Sun/op-validate.sed 2008-05-09 09:31:08.000000000 +0000
-@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan
- /\.Lfe[0-9][0-9]*:/d
- /\.LFE[0-9][0-9]*:/d
- /size[[:space:]]/d
-+/p2align[[:space:]]/d
-+/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d
- /^[/#]NO_APP[[:space:]]*$/d
- /^$/!b bad
- b end
Copied: trunk/debian/patches/12-make-module.dpatch (from rev 269, trunk/debian/patches/13-make-module.dpatch)
===================================================================
--- trunk/debian/patches/12-make-module.dpatch (rev 0)
+++ trunk/debian/patches/12-make-module.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -0,0 +1,40 @@
+#! /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@
+
+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
+@@ -43,12 +43,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
Deleted: trunk/debian/patches/13-make-module.dpatch
===================================================================
--- trunk/debian/patches/13-make-module.dpatch 2008-05-09 09:32:58 UTC (rev 269)
+++ trunk/debian/patches/13-make-module.dpatch 2008-05-09 09:35:22 UTC (rev 270)
@@ -1,40 +0,0 @@
-#! /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@
-
-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
-@@ -43,12 +43,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
More information about the Pkg-virtualbox-commits
mailing list