[Pkg-virtualbox-commits] r224 - in trunk/debian: . patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Wed Feb 20 13:00:26 UTC 2008
Author: meskes
Date: 2008-02-20 13:00:25 +0000 (Wed, 20 Feb 2008)
New Revision: 224
Removed:
trunk/debian/patches/02-diff-vmreq.dpatch
trunk/debian/patches/08-module-build.dpatch
trunk/debian/patches/09-no-registration.dpatch
Modified:
trunk/debian/patches/00list
trunk/debian/patches/01-no-64bit-guest.dpatch
trunk/debian/rules
Log:
Adjusted patches for 1.5.6.
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2008-02-20 12:28:35 UTC (rev 223)
+++ trunk/debian/patches/00list 2008-02-20 13:00:25 UTC (rev 224)
@@ -1,11 +1,8 @@
01-no-64bit-guest.dpatch
-02-diff-vmreq.dpatch
03-config-kmk.dpatch
04-localconf-kmk.dpatch
05-vboxdrv-references.dpatch
06-vboxadd-udev.dpatch
07-xsession.dpatch
-08-module-build.dpatch
-09-no-registration.dpatch
10-initscript.dpatch
Modified: trunk/debian/patches/01-no-64bit-guest.dpatch
===================================================================
--- trunk/debian/patches/01-no-64bit-guest.dpatch 2008-02-20 12:28:35 UTC (rev 223)
+++ trunk/debian/patches/01-no-64bit-guest.dpatch 2008-02-20 13:00:25 UTC (rev 224)
@@ -17,24 +17,6 @@
[ "$OS" = "solaris" ] && BUILD_CPU=`isainfo | cut -f 1 -d ' '`
case "$BUILD_CPU" in
i[3456789]86|x86|i86pc)
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/Makefile.kmk virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/Makefile.kmk
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/Makefile.kmk 2007-10-22 21:24:00.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/Makefile.kmk 2007-12-30 06:28:14.000000000 +0000
-@@ -22,10 +22,13 @@ SUBDIRS =
- ifeq ($(filter-out linux l4, $(BUILD_TARGET)),)
- SUBDIRS += \
- module \
-+ sharedfolders
-+endif
-+ifeq ($(filter-out x86, $(BUILD_TARGET_ARCH)),)
-+SUBDIRS += \
- daemon \
- xgraphics \
- xmouse \
-- sharedfolders \
- xclient
- endif
-
diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
--- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-08-14 12:26:25.000000000 +0000
+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-12-30 06:28:14.000000000 +0000
Deleted: trunk/debian/patches/02-diff-vmreq.dpatch
===================================================================
--- trunk/debian/patches/02-diff-vmreq.dpatch 2008-02-20 12:28:35 UTC (rev 223)
+++ trunk/debian/patches/02-diff-vmreq.dpatch 2008-02-20 13:00:25 UTC (rev 224)
@@ -1,63 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-diff-vmreq.dpatch by Michael Meskes <meskes at debian.org>
-##
-## DP: Fix runtime assertions
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/VMM/VMReq.cpp virtualbox-ose-1.5.4-dfsg/src/VBox/VMM/VMReq.cpp
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/VMM/VMReq.cpp 2007-12-19 13:25:48.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/VMM/VMReq.cpp 2008-02-09 06:45:12.000000000 +0000
-@@ -525,9 +525,16 @@ VMR3DECL(int) VMR3ReqQueue(PVMREQ pReq,
- return VERR_VM_REQUEST_INVALID_TYPE;
- }
-
-+ /*
-+ * Are we the EMT or not?
-+ * Also, store pVM (and fFlags) locally since pReq may be invalid after queuing it.
-+ */
- int rc = VINF_SUCCESS;
-- if (pReq->pVM->NativeThreadEMT != RTThreadNativeSelf())
-+ PVM pVM = ((VMREQ volatile *)pReq)->pVM; /* volatile paranoia */
-+ if (pVM->NativeThreadEMT != RTThreadNativeSelf())
- {
-+ unsigned fFlags = ((VMREQ volatile *)pReq)->fFlags; /* volatile paranoia */
-+
- /*
- * Insert it.
- */
-@@ -535,20 +542,20 @@ VMR3DECL(int) VMR3ReqQueue(PVMREQ pReq,
- PVMREQ pNext;
- do
- {
-- pNext = pReq->pVM->vm.s.pReqs;
-+ pNext = pVM->vm.s.pReqs;
- pReq->pNext = pNext;
-- } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pReq->pVM->vm.s.pReqs, (void *)pReq, (void *)pNext));
-+ } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pVM->vm.s.pReqs, (void *)pReq, (void *)pNext));
-
- /*
- * Notify EMT.
- */
-- VM_FF_SET(pReq->pVM, VM_FF_REQUEST);
-- VMR3NotifyFF(pReq->pVM, false);
-+ VM_FF_SET(pVM, VM_FF_REQUEST);
-+ VMR3NotifyFF(pVM, false);
-
- /*
- * Wait and return.
- */
-- if (!(pReq->fFlags & VMREQFLAGS_NO_WAIT))
-+ if (!(fFlags & VMREQFLAGS_NO_WAIT))
- rc = VMR3ReqWait(pReq, cMillies);
- LogFlow(("VMR3ReqQueue: returns %Vrc\n", rc));
- }
-@@ -558,7 +565,7 @@ VMR3DECL(int) VMR3ReqQueue(PVMREQ pReq,
- * The requester was EMT, just execute it.
- */
- pReq->enmState = VMREQSTATE_QUEUED;
-- rc = vmR3ReqProcessOne(pReq->pVM, pReq);
-+ rc = vmR3ReqProcessOne(pVM, pReq);
- LogFlow(("VMR3ReqQueue: returns %Vrc (processed)\n", rc));
- }
- return rc;
Deleted: trunk/debian/patches/08-module-build.dpatch
===================================================================
--- trunk/debian/patches/08-module-build.dpatch 2008-02-20 12:28:35 UTC (rev 223)
+++ trunk/debian/patches/08-module-build.dpatch 2008-02-20 13:00:25 UTC (rev 224)
@@ -1,568 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 08-module-build.dpatch by Michael Meskes <meskes at debian.org>
-##
-## DP: Make sure modules build in a kernel build environment.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/Makefile.module
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/module/Makefile.module 2007-09-24 20:13:56.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/Makefile.module 2008-02-09 06:47:10.000000000 +0000
-@@ -3,18 +3,19 @@
- #
- # (For 2.6.x this file must be 'Makefile'!)
- #
--# Copyright (C) 2006-2007 innotek GmbH
--#
--# 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 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.
--
-+# Copyright (C) 2006-2007 innotek GmbH
-+#
-+# 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.
- #
--MODULE = vboxadd
-+
-+# override is required by the Debian guys
-+override MODULE = vboxadd
- OBJS = \
- cmc.o \
- hgcmcall.o \
-@@ -31,49 +32,69 @@ OBJS = \
-
- ifneq ($(MAKECMDGOALS),clean)
-
--# kernel base directory
--ifndef KERN_DIR
-- KERN_DIR := /lib/modules/$(shell uname -r)/build
-- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- KERN_DIR := /usr/src/linux
-+ifeq ($(KERNELRELEASE),)
-+
-+ #
-+ # building from this directory
-+ #
-+
-+ # kernel base directory
-+ ifndef KERN_DIR
-+ KERN_DIR := /lib/modules/$(shell uname -r)/build
-+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-+ KERN_DIR := /usr/src/linux
-+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-+ $(error Error: unable to find the sources of your current Linux kernel. \
-+ Specify KERN_DIR=<directory> and run Make again)
-+ endif
-+ $(warning Warning: using /usr/src/linux as the source directory of your \
-+ Linux kernel. If this is not correct, specify \
-+ KERN_DIR=<directory> and run Make again.)
-+ endif
-+ else
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- $(error Error: unable to find the sources of your current Linux kernel. Specify KERN_DIR=<directory> and run Make again.)
-+ $(error Error: KERN_DIR does not point to a directory)
- endif
-- $(warning Warning: using /usr/src/linux as the source directory of your Linux kernel. If this is not correct, specify KERN_DIR=<directory> and run Make again.)
- endif
--else
-- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- $(error Error: KERN_DIR does not point to a directory.)
-+
-+ # includes
-+ ifndef KERN_INCL
-+ KERN_INCL = $(KERN_DIR)/include
-+ endif
-+ ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-+ $(error Error: unable to find the include directory for your current Linux \
-+ kernel. Specify KERN_INCL=<directory> and run Make again)
- endif
--endif
-
--# includes
--ifndef KERN_INCL
-- KERN_INCL = $(KERN_DIR)/include
--endif
--ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-- $(error Error: unable to find the include directory for your current Linux kernel. Specify KERN_INCL=<directory> and run Make again.)
--endif
-+ # module install dir.
-+ ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-+ ifndef MODULE_DIR
-+ MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-+ ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-+ MODULE_DIR := $(MODULE_DIR_TST)/misc
-+ else
-+ $(error Unable to find the folder to install the additions driver to)
-+ endif
-+ endif # MODULE_DIR unspecified
-+ endif
-
--# module install dir.
--ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-- ifndef MODULE_DIR
-- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-- MODULE_DIR := $(MODULE_DIR_TST)/misc
-- else
-- $(error Unable to find the folder to install the additions driver to)
-- endif
-- endif # MODULE_DIR unspecified
--endif
-+ # guess kernel version (24 or 26)
-+ ifeq ($(shell if grep '"2.4.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
-+ KERN_VERSION := 24
-+ else
-+ KERN_VERSION := 26
-+ endif
-+ # KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
-
--# guess kernel version (24 or 26)
--ifeq ($(shell if grep '"2.4.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
--KERN_VERSION := 24
--else
--KERN_VERSION := 26
--endif
--# KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
-+else # neq($(KERNELRELEASE),)
-+
-+ #
-+ # building from Linux-2.6-kbuild (make -C <kernel_directory> M=`pwd`)
-+ #
-+
-+ KERN_VERSION := 26
-+
-+endif # neq($(KERNELRELEASE),)
-
- # debug - show guesses.
- ifdef DEBUG
-@@ -88,18 +109,19 @@ endif
- # Compiler options
- #
- ifndef INCL
-- INCL := -I$(KERN_INCL) $(addprefix -I, $(EXTRA_INCL))
-+ INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL))
- ifndef KBUILD_EXTMOD
- KBUILD_EXTMOD := $(shell pwd)
- endif
- INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
- export INCL
- endif
--KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 -DIN_SUP_R0 \
-- -DVBGL_VBOXGUEST -DVBOX_HGCM -DLOG_TO_BACKDOOR
--#ifeq ($(BUILD_TYPE),debug) - you'll have to enable this manually to get debug stuff.
--#KFLAGS += -DDEBUG
--#endif
-+KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ \
-+ -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DVBGL_VBOXGUEST -DVBOX_HGCM \
-+ -DLOG_TO_BACKDOOR -DRT_WITH_VBOX -DIN_MODULE -DIN_GUEST_R0
-+ifeq ($(BUILD_TYPE),debug)
-+KFLAGS += -DDEBUG
-+endif
-
- ifeq ($(KERN_VERSION), 24)
- #
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Additions/linux/sharedfolders/Makefile.module 2007-09-24 20:13:56.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2008-02-09 06:47:10.000000000 +0000
-@@ -3,18 +3,19 @@
- #
- # (For 2.6.x this file must be 'Makefile'!)
- #
--# Copyright (C) 2006-2007 innotek GmbH
--#
--# 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 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.
--
-+# Copyright (C) 2006-2007 innotek GmbH
-+#
-+# 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.
- #
--MODULE = vboxvfs
-+
-+# override is required by the Debian guys
-+override MODULE = vboxvfs
- OBJS = \
- vfsmod.o \
- vfs-utils.o \
-@@ -38,49 +39,69 @@ EXTRA_CFLAGS = -fshort-wchar
-
- ifneq ($(MAKECMDGOALS),clean)
-
--# kernel base directory
--ifndef KERN_DIR
-- KERN_DIR := /lib/modules/$(shell uname -r)/build
-- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- KERN_DIR := /usr/src/linux
-+ifeq ($(KERNELRELEASE),)
-+
-+ #
-+ # building from this directory
-+ #
-+
-+ # kernel base directory
-+ ifndef KERN_DIR
-+ KERN_DIR := /lib/modules/$(shell uname -r)/build
-+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-+ KERN_DIR := /usr/src/linux
-+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-+ $(error Error: unable to find the sources of your current Linux kernel. \
-+ Specify KERN_DIR=<directory> and run Make again)
-+ endif
-+ $(warning Warning: using /usr/src/linux as the source directory of your \
-+ Linux kernel. If this is not correct, specify \
-+ KERN_DIR=<directory> and run Make again.)
-+ endif
-+ else
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- $(error Error: unable to find the sources of your current Linux kernel. Specify KERN_DIR=<directory> and run Make again.)
-+ $(error Error: KERN_DIR does not point to a directory)
- endif
-- $(warning Warning: using /usr/src/linux as the source directory of your Linux kernel. If this is not correct, specify KERN_DIR=<directory> and run Make again.)
- endif
--else
-- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- $(error Error: KERN_DIR does not point to a directory.)
-+
-+ # includes
-+ ifndef KERN_INCL
-+ KERN_INCL = $(KERN_DIR)/include
-+ endif
-+ ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-+ $(error Error: unable to find the include directory for your current Linux \
-+ kernel. Specify KERN_INCL=<directory> and run Make again)
- endif
--endif
-
--# includes
--ifndef KERN_INCL
-- KERN_INCL = $(KERN_DIR)/include
--endif
--ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-- $(error Error: unable to find the include directory for your current Linux kernel. Specify KERN_INCL=<directory> and run Make again.)
--endif
-+ # module install dir.
-+ ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-+ ifndef MODULE_DIR
-+ MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-+ ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-+ MODULE_DIR := $(MODULE_DIR_TST)/misc
-+ else
-+ $(error Unable to find the folder to install the shared folders driver to)
-+ endif
-+ endif # MODULE_DIR unspecified
-+ endif
-
--# module install dir.
--ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-- ifndef MODULE_DIR
-- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-- MODULE_DIR := $(MODULE_DIR_TST)/misc
-- else
-- $(error Unable to find the folder to install the shared folders driver to)
-- endif
-- endif # MODULE_DIR unspecified
--endif
-+ # guess kernel version (24 or 26)
-+ ifeq ($(shell if grep '"2.4.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
-+ KERN_VERSION := 24
-+ else
-+ KERN_VERSION := 26
-+ endif
-+ # KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
-
--# guess kernel version (24 or 26)
--ifeq ($(shell if grep '"2.4.' $(KERN_INCL)/linux/version.h > /dev/null; then echo yes; fi),yes)
--KERN_VERSION := 24
--else
--KERN_VERSION := 26
--endif
--# KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
-+else # neq($(KERNELRELEASE),)
-+
-+ #
-+ # building from Linux-2.6-kbuild (make -C <kernel_directory> M=`pwd`)
-+ #
-+
-+ KERN_VERSION := 26
-+
-+endif # neq($(KERNELRELEASE),)
-
- # debug - show guesses.
- ifdef DEBUG
-@@ -95,18 +116,19 @@ endif
- # Compiler options
- #
- ifndef INCL
-- INCL := -I$(KERN_INCL) $(addprefix -I, $(EXTRA_INCL))
-+ INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL))
- ifndef KBUILD_EXTMOD
- KBUILD_EXTMOD := $(shell pwd)
- endif
- INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
- export INCL
- endif
--KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 -DIN_SUP_R0 \
-- -DVBOX_HGCM -DLOG_TO_BACKDOOR
--#ifeq ($(BUILD_TYPE),debug) - you'll have to enable this manually to get debug stuff.
--#KFLAGS += -DDEBUG
--#endif
-+KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 \
-+ -DIN_SUP_R0 -DVBOX -DVBOX_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
-+ -DIN_GUEST_R0
-+ifeq ($(BUILD_TYPE),debug)
-+KFLAGS += -DDEBUG
-+endif
-
- ifeq ($(KERN_VERSION), 24)
- #
-@@ -133,16 +155,19 @@ MODULE_EXT := ko
-
- $(MODULE)-y := $(OBJS)
-
--# detect FC6 2.6.18
--KFLAGS += $(foreach inc,$(KERN_INCL),\
-- $(if $(wildcard $(inc)/linux/utsrelease.h),\
-- $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
-- then echo yes; fi),-DKERNEL_FC6,),))
--# detect rhel5 2.6.18
--KFLAGS += $(foreach inc,$(KERN_INCL),\
-- $(if $(wildcard $(inc)/linux/utsrelease.h),\
-- $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
-- then echo yes; fi),-DKERNEL_FC6,),))
-+# special hack for FC6 2.6.18 and rhel5 2.6.18
-+ifeq ($(KERNELRELEASE),)
-+ KFLAGS += $(foreach inc,$(KERN_INCL),\
-+ $(if $(wildcard $(inc)/linux/utsrelease.h),\
-+ $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
-+ then echo yes; fi),-DKERNEL_FC6,),) \
-+ $(if $(wildcard $(inc)/linux/utsrelease.h),\
-+ $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
-+ then echo yes; fi),-DKERNEL_FC6,),))
-+else
-+ KFLAGS += $(filter -DKERNEL_FC6,$(patsubst 2.6.18%fc6,-DKERNEL_FC6,$(KERNELRELEASE)) \
-+ $(patsubst 2.6.18%el5,-DKERNEL_FC6,$(KERNELRELEASE)))
-+endif
-
- # build defs
- EXTRA_CFLAGS += $(INCL) $(KFLAGS) $(KDEBUG)
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-12 21:19:22.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2008-02-09 06:47:10.000000000 +0000
-@@ -5,19 +5,30 @@
-
- #
- #
--# Copyright (C) 2006 innotek GmbH
-+# Copyright (C) 2006-2007 innotek GmbH
-+#
-+# 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.
-+#
-+# The contents of this file may alternatively be used under the terms
-+# of the Common Development and Distribution License Version 1.0
-+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
-+# VirtualBox OSE distribution, in which case the provisions of the
-+# CDDL are applicable instead of those of the GPL.
-+#
-+# You may elect to license modified versions of this file under the
-+# terms and conditions of either the GPL or the CDDL or both.
- #
--# 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 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.
-
- #
--# First, figure out which architecture we're targeting.
-+# First, figure out which architecture we're targeting and the build type.
- # (We have to support basic cross building (ARCH=i386|x86_64).)
-+# While at it, warn about BUILD_* vars found to help with user problems.
- #
- ifneq ($(filter-out amd64 x86,$(BUILD_TARGET_ARCH)),)
- $(warning Ignoring unknown BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)'.)
-@@ -37,10 +48,23 @@ ifeq ($(BUILD_TARGET_ARCH),)
- endif
- endif
- endif
-+else
-+ $(warning Using BUILD_TARGET_ARCH='$(BUILD_TARGET_ARCH)' from the $(origin BUILD_TARGET_ARCH).)
-+endif
-+
-+ifneq ($(filter-out release profile debug strict,$(BUILD_TYPE)),)
-+ $(warning Ignoring unknown BUILD_TYPE value '$(BUILD_TYPE)'.)
-+ BUILD_TYPE :=
-+endif
-+ifeq ($(BUILD_TYPE),)
-+ BUILD_TYPE := release
-+else
-+ $(warning Using BUILD_TYPE='$(BUILD_TYPE)' from the $(origin BUILD_TYPE).)
- endif
-
-
--MODULE = vboxdrv
-+# override is required by the Debian guys
-+override MODULE = vboxdrv
- OBJS = \
- linux/SUPDrv-linux.o \
- SUPDRVShared.o \
-@@ -58,53 +82,74 @@ endif
-
- ifneq ($(MAKECMDGOALS),clean)
-
--# kernel base directory
--ifndef KERN_DIR
-- # build for the current kernel, version check
-- KERN_DIR := /lib/modules/$(shell uname -r)/build
-- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- KERN_DIR := /usr/src/linux
-+ifeq ($(KERNELRELEASE),)
-+
-+ #
-+ # building from this directory
-+ #
-+
-+ # kernel base directory
-+ ifndef KERN_DIR
-+ # build for the current kernel, version check
-+ KERN_DIR := /lib/modules/$(shell uname -r)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- $(error Error: unable to find the sources of your current Linux kernel. Specify KERN_DIR=<directory> and run Make again.)
-+ KERN_DIR := /usr/src/linux
-+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-+ $(error Error: unable to find the sources of your current Linux kernel. \
-+ Specify KERN_DIR=<directory> and run Make again)
-+ endif
-+ $(warning Warning: using /usr/src/linux as the source directory of your \
-+ Linux kernel. If this is not correct, specify \
-+ KERN_DIR=<directory> and run Make again.)
- endif
-- $(warning Warning: using /usr/src/linux as the source directory of your Linux kernel. If this is not correct, specify KERN_DIR=<directory> and run Make again.)
-- endif
-- # check if versions match -- works only for later 2.6 kernels
-- VBOX_KERN_VER := $(shell $(MAKE) -sC $(KERN_DIR) kernelrelease 2> /dev/null || true)
-- ifneq ($(VBOX_KERN_VER),)
-- ifneq ($(VBOX_KERN_VER),$(shell uname -r))
-- $(error Error: /usr/src/linux (version $(VBOX_KERN_VER)) does not match the current kernel (version $(shell uname -r)))
-+ # check if versions match -- works only for later 2.6 kernels
-+ VBOX_KERN_VER := $(shell $(MAKE) -sC $(KERN_DIR) kernelrelease 2> /dev/null || true)
-+ ifneq ($(VBOX_KERN_VER),)
-+ ifneq ($(VBOX_KERN_VER),$(shell uname -r))
-+ $(error Error: /usr/src/linux (version $(VBOX_KERN_VER)) does not match \
-+ the current kernel (version $(shell uname -r)))
-+ endif
-+ endif
-+ else
-+ # build for a dedicated kernel, no version check
-+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-+ $(error Error: KERN_DIR does not point to a directory)
- endif
- endif
--else
-- # build for a dedicated kernel, no version check
-- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
-- $(error Error: KERN_DIR does not point to a directory.)
-+
-+ # includes
-+ ifndef KERN_INCL
-+ KERN_INCL = $(KERN_DIR)/include
-+ endif
-+ ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-+ $(error Error: unable to find the include directory for your current Linux \
-+ kernel. Specify KERN_INCL=<directory> and run Make again)
- endif
--endif
-
--# includes
--ifndef KERN_INCL
-- KERN_INCL = $(KERN_DIR)/include
--endif
--ifneq ($(shell if test -d $(KERN_INCL); then echo yes; fi),yes)
-- $(error Error: unable to find the include directory for your current Linux kernel. Specify KERN_INCL=<directory> and run Make again.)
--endif
-+ # module install dir, only for current kernel
-+ ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-+ ifndef MODULE_DIR
-+ MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-+ ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-+ MODULE_DIR := $(MODULE_DIR_TST)/misc
-+ else
-+ $(error Unable to find the folder to install the support driver to)
-+ endif
-+ endif # MODULE_DIR unspecified
-+ endif
-
--# module install dir, only for current kernel
--ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
-- ifndef MODULE_DIR
-- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
-- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-- MODULE_DIR := $(MODULE_DIR_TST)/misc
-- else
-- $(error Unable to find the folder to install the support driver to)
-- endif
-- endif # MODULE_DIR unspecified
--endif
-+ # guess kernel version (24 or 26)
-+ KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
-+
-+else # neq($(KERNELRELEASE),)
-+
-+ #
-+ # building from Linux-2.6-kbuild (make -C <kernel_directory> M=`pwd`)
-+ #
-+
-+ KERN_VERSION := 26
-
--# guess kernel version (24 or 26)
--KERN_VERSION := $(if $(wildcard $(KERN_DIR)/Rules.make),24,26)
-+endif # neq($(KERNELRELEASE),)
-
- # debug - show guesses.
- ifdef DEBUG
-@@ -118,14 +163,14 @@ endif
- # Compiler options
- #
- ifndef INCL
-- INCL := -I$(KERN_INCL) $(addprefix -I, $(EXTRA_INCL))
-+ INCL := $(addprefix -I,$(KERN_INCL) $(EXTRA_INCL))
- ifndef KBUILD_EXTMOD
- KBUILD_EXTMOD := $(shell pwd)
- endif
- INCL += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
- export INCL
- endif
--KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0
-+KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX
- ifndef CONFIG_VBOXDRV_FIXEDMAJOR
- KFLAGS += -DCONFIG_VBOXDRV_AS_MISC
- endif
Deleted: trunk/debian/patches/09-no-registration.dpatch
===================================================================
--- trunk/debian/patches/09-no-registration.dpatch 2008-02-20 12:28:35 UTC (rev 223)
+++ trunk/debian/patches/09-no-registration.dpatch 2008-02-20 13:00:25 UTC (rev 224)
@@ -1,68 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 09-no-registration.dpatch by Frank Mehnert <frank at innotek.de>
-##
-## DP: Do not ask for registration. This is taken from SVN and can safely be
-## DP: removed as soon as the files in SVN are realeased.
-
- at DPATCH@
-
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk 2007-12-17 14:38:59.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk 2007-12-30 06:33:53.000000000 +0000
-@@ -31,6 +31,9 @@ FORMS :=
- TRANSLATIONS :=
- IMAGES :=
-
-+VBOX_WITH_REGISTRATION := 1
-+VBOX_WITH_REGISTRATION_REQUEST := 1
-+
- DEPTH = ../../../..
- include $(PATH_KBUILD)/header.kmk
-
-@@ -38,10 +41,6 @@ include $(PATH_KBUILD)/header.kmk
- #
- # exclude inappropriate UI content
- #
--#ifndef VBOX_OSE
--VBOX_WITH_REGISTRATION := 1
--#endif
--
- ifndef VBOX_WITH_REGISTRATION
- VirtualBox_QT_UISRCS := $(filter-out ui/VBoxRegistrationDlg.ui,$(VirtualBox_QT_UISRCS))
- endif
-@@ -217,6 +216,9 @@ endif
- ifdef VBOX_WITH_REGISTRATION
- VirtualBox_DEFS += VBOX_WITH_REGISTRATION
- endif
-+ifdef VBOX_WITH_REGISTRATION_REQUEST
-+ VirtualBox_DEFS += VBOX_WITH_REGISTRATION_REQUEST
-+endif
- ifdef VBOX_WITH_ALSA
- VirtualBox_DEFS += VBOX_WITH_ALSA
- endif
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2007-10-18 07:23:36.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp 2007-12-30 06:33:53.000000000 +0000
-@@ -929,7 +929,9 @@ void VBoxConsoleWnd::finalizeOpenView()
- mIsOpenViewFinished = true;
- LogFlowFuncLeave();
-
-+#ifdef VBOX_WITH_REGISTRATION_REQUEST
- vboxGlobal().showRegistrationDialog (false /* aForce */);
-+#endif
- }
-
- /**
-diff -Naurp virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/main.cpp virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp
---- virtualbox-ose-1.5.4-dfsg.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2007-12-28 08:15:25.000000000 +0000
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp 2007-12-30 06:33:53.000000000 +0000
-@@ -242,7 +242,9 @@ int main (int argc, char **argv)
- {
- a.setMainWidget (&vboxGlobal().selectorWnd());
- vboxGlobal().selectorWnd().show();
-+#ifdef VBOX_WITH_REGISTRATION_REQUEST
- vboxGlobal().showRegistrationDialog (false /* aForce */);
-+#endif
- vboxGlobal().startEnumeratingMedia();
- rc = a.exec();
- }
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2008-02-20 12:28:35 UTC (rev 223)
+++ trunk/debian/rules 2008-02-20 13:00:25 UTC (rev 224)
@@ -23,6 +23,12 @@
env.sh: patch-stamp
dh_testdir
./configure --with-linux="/usr" --disable-kmods
+ if [ "`dpkg --print-architecture`" = "i386" ]; then \
+ echo "VBOX_WITH_X11_ADDITIONS=1" >> LocalConfig.kmk; \
+ else \
+ echo "VBOX_WITH_X11_ADDITIONS=" >> LocalConfig.kmk; \
+ fi
+
build: build-stamp
build-stamp: env.sh
More information about the Pkg-virtualbox-commits
mailing list