[Pkg-virtualbox-commits] r339 - trunk/debian/patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Wed Sep 3 11:01:29 UTC 2008
Author: meskes
Date: 2008-09-03 11:01:28 +0000 (Wed, 03 Sep 2008)
New Revision: 339
Removed:
trunk/debian/patches/05-vboxadd-udev.dpatch
trunk/debian/patches/14_logging.dpatch
trunk/debian/patches/15_makefiles.dpatch
Modified:
trunk/debian/patches/00list
trunk/debian/patches/02-config-kmk.dpatch
Log:
Adapted patches (and changelog) for 1.6.6 release.
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2008-08-25 08:42:40 UTC (rev 338)
+++ trunk/debian/patches/00list 2008-09-03 11:01:28 UTC (rev 339)
@@ -2,7 +2,6 @@
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
@@ -11,5 +10,3 @@
11-gcc-4.3.dpatch
12-make-module.dpatch
13-module-mismatch.dpatch
-14_logging.dpatch
-15_makefiles.dpatch
Modified: trunk/debian/patches/02-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/02-config-kmk.dpatch 2008-08-25 08:42:40 UTC (rev 338)
+++ trunk/debian/patches/02-config-kmk.dpatch 2008-09-03 11:01:28 UTC (rev 339)
@@ -18,12 +18,3 @@
endif
# XPCOM setup for all but win32.
-@@ -1480,7 +1480,7 @@ if1of ($(KBUILD_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/05-vboxadd-udev.dpatch
===================================================================
--- trunk/debian/patches/05-vboxadd-udev.dpatch 2008-08-25 08:42:40 UTC (rev 338)
+++ trunk/debian/patches/05-vboxadd-udev.dpatch 2008-09-03 11:01:28 UTC (rev 339)
@@ -1,35 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 05-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
-@@ -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/14_logging.dpatch
===================================================================
--- trunk/debian/patches/14_logging.dpatch 2008-08-25 08:42:40 UTC (rev 338)
+++ trunk/debian/patches/14_logging.dpatch 2008-09-03 11:01:28 UTC (rev 339)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 14-logging.dpatch by Michael Meskes <meskes at debian.org>
-##
-## DP: Remove excessive logging.
-
- at DPATCH@
-
-diff -Naurp VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c.orig VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c
---- VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c.orig 2008-08-06 10:03:37.000000000 +0200
-+++ VirtualBox-1.6.4/src/recompiler/VBoxRecompiler.c 2008-08-06 10:03:56.000000000 +0200
-@@ -1521,7 +1521,7 @@ int remR3NotifyTrap(CPUState *env, uint3
- STAM_COUNTER_INC(&s_aStatTrap[uTrap]);
- }
- #endif
-- RTLogPrintf("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%08x\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]);
-+ /*RTLogPrintf("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%08x\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]);*/
- if( uTrap < 0x20
- && (env->cr[0] & X86_CR0_PE)
- && !(env->eflags & X86_EFL_VM))
Deleted: trunk/debian/patches/15_makefiles.dpatch
===================================================================
--- trunk/debian/patches/15_makefiles.dpatch 2008-08-25 08:42:40 UTC (rev 338)
+++ trunk/debian/patches/15_makefiles.dpatch 2008-09-03 11:01:28 UTC (rev 339)
@@ -1,84 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 15-makefiles.dpatch by Michael Meskes <meskes at debian.org>
-##
-## DP: Add missing makefiles.
-
- at DPATCH@
-
---- virtualbox-ose-1.6.4-dfsg/src/apps/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.kmk 2008-08-09 21:40:09.000000000 +0200
-@@ -0,0 +1,36 @@
-+# $Id: Makefile.kmk 34052 2008-08-04 17:27:28Z klaus $
-+## @file
-+# Top-level makefile for the external apps.
-+#
-+
-+#
-+# Copyright (C) 2006-2007 Sun Microsystems, Inc.
-+#
-+# This file is part of VirtualBox Open Source Edition (OSE), as
-+# available from http://www.virtualbox.org. This file is free software;
-+# you can redistribute it and/or modify it under the terms of the GNU
-+# General Public License (GPL) as published by the Free Software
-+# Foundation, in version 2 as it comes in the "COPYING" file of the
-+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-+#
-+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
-+# Clara, CA 95054 USA or visit http://www.sun.com if you need
-+# additional information or have any questions.
-+#
-+
-+DEPTH = ../..
-+include $(KBUILD_PATH)/header.kmk
-+
-+ifdef VBOX_WITH_KCHMVIEWER
-+ifneq ($(wildcard kchmviewer-2.6),)
-+SUBDIRS.linux = kchmviewer-2.6
-+endif
-+endif
-+
-+ifneq ($(wildcard tunctl),)
-+SUBDIRS.linux += tunctl
-+endif
-+
-+include $(KBUILD_PATH)/rules.kmk
-+
---- virtualbox-ose-1.6.4-dfsg/src/apps/tunctl/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.kmk 2008-08-09 21:42:10.000000000 +0200
-@@ -0,0 +1,35 @@
-+# $Id: Makefile.kmk 31342 2008-05-28 08:44:35Z frank $
-+## @file
-+# Makefile for VBoxTunctl, which is identical to tunctl from Usermode Linux
-+# except for the name.
-+#
-+
-+#
-+# Copyright (C) 2006-2007 Sun Microsystems, Inc.
-+#
-+# This file is part of VirtualBox Open Source Edition (OSE), as
-+# available from http://www.virtualbox.org. This file is free software;
-+# you can redistribute it and/or modify it under the terms of the GNU
-+# General Public License (GPL) as published by the Free Software
-+# Foundation, in version 2 as it comes in the "COPYING" file of the
-+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-+#
-+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
-+# Clara, CA 95054 USA or visit http://www.sun.com if you need
-+# additional information or have any questions.
-+#
-+
-+DEPTH = ../../..
-+include $(KBUILD_PATH)/header.kmk
-+
-+ifneq ($(KBUILD_HOST),linux)
-+$(error "VBoxTunctl can only be built on Linux!")
-+endif
-+
-+PROGRAMS = VBoxTunctl
-+
-+VBoxTunctl_TEMPLATE = VBOXR3EXE
-+VBoxTunctl_SOURCES = tunctl.c
-+
-+include $(KBUILD_PATH)/footer.kmk
More information about the Pkg-virtualbox-commits
mailing list