[Pkg-virtualbox-commits] r175 - in trunk/debian: . patches
daniel at alioth.debian.org
daniel at alioth.debian.org
Tue Jan 1 23:40:41 UTC 2008
Author: daniel
Date: 2008-01-01 23:40:40 +0000 (Tue, 01 Jan 2008)
New Revision: 175
Modified:
trunk/debian/changelog
trunk/debian/patches/02-module-in-kernel.dpatch
Log:
Rediffed 02-module-in-kernel.dpatch.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-01-01 13:56:33 UTC (rev 174)
+++ trunk/debian/changelog 2008-01-01 23:40:40 UTC (rev 175)
@@ -1,3 +1,9 @@
+virtualbox-ose (1.5.4-dfsg-2) unstable; urgency=low
+
+ * Rediffed 02-module-in-kernel.dpatch.
+
+ -- Daniel Baumann <daniel at debian.org> Wed, 2 Jan 2008 00:41:00 +0100
+
virtualbox-ose (1.5.4-dfsg-1) unstable; urgency=low
[ Michael Meskes ]
Modified: trunk/debian/patches/02-module-in-kernel.dpatch
===================================================================
--- trunk/debian/patches/02-module-in-kernel.dpatch 2008-01-01 13:56:33 UTC (rev 174)
+++ trunk/debian/patches/02-module-in-kernel.dpatch 2008-01-01 23:40:40 UTC (rev 175)
@@ -5,9 +5,10 @@
@DPATCH@
---- virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module.orig 2007-09-24 22:13:56.000000000 +0200
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2008-01-01 13:03:53.000000000 +0100
-@@ -38,28 +38,30 @@
+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-01-01 23:38:28.000000000 +0000
+@@ -31,28 +31,30 @@ OBJS = \
ifneq ($(MAKECMDGOALS),clean)
@@ -56,7 +57,7 @@
endif
# module install dir.
-@@ -95,7 +97,10 @@
+@@ -88,7 +90,10 @@ endif
# Compiler options
#
ifndef INCL
@@ -68,22 +69,21 @@
ifndef KBUILD_EXTMOD
KBUILD_EXTMOD := $(shell pwd)
endif
---- virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile.orig 2008-01-01 12:58:40.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2008-01-01 13:00:24.000000000 +0100
-@@ -58,37 +58,39 @@
+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-01-01 23:38:28.000000000 +0000
+@@ -38,28 +38,30 @@ EXTRA_CFLAGS = -fshort-wchar
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),)
+ # 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.)
@@ -92,32 +92,17 @@
+ $(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
+- $(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
-- # 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
-endif
-# includes
@@ -135,8 +120,8 @@
+ endif
endif
- # module install dir, only for current kernel
-@@ -118,7 +120,10 @@
+ # module install dir.
+@@ -95,7 +97,10 @@ endif
# Compiler options
#
ifndef INCL
@@ -148,20 +133,23 @@
ifndef KBUILD_EXTMOD
KBUILD_EXTMOD := $(shell pwd)
endif
---- virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/Makefile.module.orig 2008-01-01 13:19:09.000000000 +0100
-+++ virtualbox-ose-1.5.4-dfsg/src/VBox/Additions/linux/module/Makefile.module 2008-01-01 13:20:44.000000000 +0100
-@@ -31,28 +31,30 @@
+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-01-01 23:38:28.000000000 +0000
+@@ -58,37 +58,39 @@ 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),)
+ # 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.)
@@ -170,17 +158,32 @@
+ $(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
-- $(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
+ 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
-endif
-# includes
@@ -198,8 +201,8 @@
+ endif
endif
- # module install dir.
-@@ -88,7 +90,10 @@
+ # module install dir, only for current kernel
+@@ -118,7 +120,10 @@ endif
# Compiler options
#
ifndef INCL
More information about the Pkg-virtualbox-commits
mailing list