[Pkg-virtualbox-commits] r67 - in trunk/debian: . patches
daniel at alioth.debian.org
daniel at alioth.debian.org
Tue Oct 9 12:33:33 UTC 2007
Author: daniel
Date: 2007-10-09 12:33:33 +0000 (Tue, 09 Oct 2007)
New Revision: 67
Added:
trunk/debian/patches/01-configure.dpatch
trunk/debian/patches/02-host-module.dpatch
trunk/debian/patches/03-config-kmk.dpatch
trunk/debian/patches/04-localconf-kmk.dpatch
Removed:
trunk/debian/patches/03-configure.dpatch
trunk/debian/patches/04-host-module.dpatch
trunk/debian/patches/config-kmk.dpatch
trunk/debian/patches/localconf-kmk.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
Log:
Rediffed, cleaned up and properly named all dpatches.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-10-09 12:19:11 UTC (rev 66)
+++ trunk/debian/changelog 2007-10-09 12:33:33 UTC (rev 67)
@@ -19,6 +19,7 @@
virtualbox-ose-source.README.Debian and virtualbox-ose.menu.
* Renaming README.Debian and README.rebuild to virtualbox-ose.README.Debian
and virtualbox-ose.README.rebuild for consistency reasons.
+ * Rediffed, cleaned up and properly named all dpatches.
-- Daniel Baumann <daniel at debian.org> Tue, 2 Oct 2007 13:57:00 +0200
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2007-10-09 12:19:11 UTC (rev 66)
+++ trunk/debian/patches/00list 2007-10-09 12:33:33 UTC (rev 67)
@@ -1,4 +1,4 @@
-03-configure.dpatch
-04-host-module.dpatch
-config-kmk.dpatch
-localconf-kmk.dpatch
+01-configure.dpatch
+02-host-module.dpatch
+03-config-kmk.dpatch
+04-localconf-kmk.dpatch
Added: trunk/debian/patches/01-configure.dpatch
===================================================================
--- trunk/debian/patches/01-configure.dpatch (rev 0)
+++ trunk/debian/patches/01-configure.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -0,0 +1,30 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-configure.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+##
+## DP: Use Debians kbuild instead; doesn't build module
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/configure virtualbox-ose-1.5.0-dfsg2/configure
+--- virtualbox-ose-1.5.0-dfsg2.orig/configure 2007-08-31 12:42:12.000000000 +0000
++++ virtualbox-ose-1.5.0-dfsg2/configure 2007-10-09 12:24:17.000000000 +0000
+@@ -248,8 +248,8 @@ check_environment()
+ exit 1
+ ;;
+ esac
+- DEVDIR_BIN="$DEVDIR/$OS.$BUILD_MACHINE/bin"
+- KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.$BUILD_MACHINE"
++ DEVDIR_BIN="/usr/bin"
++ KBUILDDIR_BIN="/usr/bin"
+ log_success "Determined build machine: $OS.$BUILD_MACHINE, target machine: $OS.$TARGET_MACHINE"
+
+ # Automatically disable XPCOM on darwin.
+@@ -1335,7 +1335,7 @@ check_gcc
+
+ # Linux-specific
+ if [ "$OS" = "linux" ]; then
+- check_linux
++# check_linux
+ check_alsa
+ check_compiler_h
+ [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
Added: trunk/debian/patches/02-host-module.dpatch
===================================================================
--- trunk/debian/patches/02-host-module.dpatch (rev 0)
+++ trunk/debian/patches/02-host-module.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 02-host-module.dpatch by Torsten Werner <twerner at debian.org>
+##
+## DP: No description.
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-1.5.0-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile
+--- virtualbox-ose-1.5.0-dfsg2.orig/src/VBox/HostDrivers/Support/linux/Makefile 2007-08-30 15:16:26.000000000 +0000
++++ virtualbox-ose-1.5.0-dfsg2/src/VBox/HostDrivers/Support/linux/Makefile 2007-10-09 12:25:02.000000000 +0000
+@@ -59,6 +59,7 @@ endif
+ ifneq ($(MAKECMDGOALS),clean)
+
+ # kernel base directory
++KERN_DIR := $(KDIR)
+ ifndef KERN_DIR
+ KERN_DIR := /lib/modules/$(shell uname -r)/build
+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
Added: trunk/debian/patches/03-config-kmk.dpatch
===================================================================
--- trunk/debian/patches/03-config-kmk.dpatch (rev 0)
+++ trunk/debian/patches/03-config-kmk.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -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.5.0-dfsg2.orig/Config.kmk virtualbox-ose-1.5.0-dfsg2/Config.kmk
+--- virtualbox-ose-1.5.0-dfsg2.orig/Config.kmk 2007-08-31 13:01:30.000000000 +0000
++++ virtualbox-ose-1.5.0-dfsg2/Config.kmk 2007-10-09 12:25:50.000000000 +0000
+@@ -838,7 +838,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.
+ ifeq ($(filter-out win.x86 linux.x86 solaris.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
+- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
++ PATH_TOOL_YASM ?= /usr/bin
+ endif
+
+ # XPCOM setup for all but win32.
+@@ -1199,7 +1199,7 @@ ifneq ($(filter linux,$(BUILD_TARGET)),)
+ 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-configure.dpatch
===================================================================
--- trunk/debian/patches/03-configure.dpatch 2007-10-09 12:19:11 UTC (rev 66)
+++ trunk/debian/patches/03-configure.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -1,28 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-configure.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
-##
-## DP: Use Debians kbuild instead ; doesn't build module
-
- at DPATCH@
---- ./configure.orig 2007-07-31 16:12:41.000000000 +0200
-+++ ./configure 2007-07-31 16:12:58.000000000 +0200
-@@ -252,8 +252,8 @@
- exit 1
- ;;
- esac
-- DEVDIR_BIN="$DEVDIR/$OS.$BUILD_MACHINE/bin"
-- KBUILDDIR_BIN="$KBUILDDIR/bin/$OS.$BUILD_MACHINE"
-+ DEVDIR_BIN="/usr/bin"
-+ KBUILDDIR_BIN="/usr/bin"
- log_success "Determined build machine: $OS.$BUILD_MACHINE, target machine: $OS.$TARGET_MACHINE"
-
- # Automatically disable XPCOM on darwin.
-@@ -1363,7 +1363,7 @@
-
- # Linux-specific
- if [ "$OS" = "linux" ]; then
-- check_linux
-+# check_linux
- check_alsa
- check_compiler_h
- [ "$WITH_HAL" = "1" ] && check_libhal
Deleted: trunk/debian/patches/04-host-module.dpatch
===================================================================
--- trunk/debian/patches/04-host-module.dpatch 2007-10-09 12:19:11 UTC (rev 66)
+++ trunk/debian/patches/04-host-module.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-host-module.dpatch by <Torsten Werner <twerner at debian.org>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad virtualbox-20070507+debian~/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-20070507+debian/src/VBox/HostDrivers/Support/linux/Makefile
---- virtualbox-20070507+debian~/src/VBox/HostDrivers/Support/linux/Makefile 2007-05-07 10:54:22.000000000 +0200
-+++ virtualbox-20070507+debian/src/VBox/HostDrivers/Support/linux/Makefile 2007-05-07 13:22:58.000000000 +0200
-@@ -65,6 +65,7 @@
- ifneq ($(MAKECMDGOALS),clean)
-
- # kernel base directory
-+KERN_DIR := $(KDIR)
- ifndef KERN_DIR
- KERN_DIR := /lib/modules/$(shell uname -r)/build
- ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
Added: trunk/debian/patches/04-localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/04-localconf-kmk.dpatch (rev 0)
+++ trunk/debian/patches/04-localconf-kmk.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -0,0 +1,20 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 04-localconf-kmk.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
+##
+## DP: Don't build the module for testing and don't build any guest additions
+## DP: both depends on kernel headers, which are atm not available
+
+ at DPATCH@
+
+diff -Naurp virtualbox-ose-1.5.0-dfsg2.orig/LocalConfig.kmk virtualbox-ose-1.5.0-dfsg2/LocalConfig.kmk
+--- virtualbox-ose-1.5.0-dfsg2.orig/LocalConfig.kmk 1970-01-01 00:00:00.000000000 +0000
++++ virtualbox-ose-1.5.0-dfsg2/LocalConfig.kmk 2007-10-09 12:26:59.000000000 +0000
+@@ -0,0 +1,8 @@
++VBOX_WITH_VBOXDRV =
++VBOX_WITH_LINUX_ONLY =
++VBOX_ADDITIONS_LINUX_ONLY =
++VBOX_WITH_INSTALLER =
++VBOX_WITH_LINUX_ADDITIONS =
++VBOX_WITH_TESTCASES =
++VBOX_WITH_TESTSUITE =
++VBOX_WITH_USB =
Deleted: trunk/debian/patches/config-kmk.dpatch
===================================================================
--- trunk/debian/patches/config-kmk.dpatch 2007-10-09 12:19:11 UTC (rev 66)
+++ trunk/debian/patches/config-kmk.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -1,27 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## by Patrick Winnertz <patrick.winnertz at skolelinux.org>
-##
-## DP: Some patches for Config.kmk to build with the debian tools
-
- at DPATCH@
- # XPCOM setup for all but win32.
---- ./Config.kmk 2007-07-31 12:01:20.000000000 +0200
-+++ ./Config.kmk 2007-07-31 12:00:35.000000000 +0200
-@@ -834,7 +834,7 @@
- # 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.
- ifeq ($(filter-out win.x86 linux.x86 solaris.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
-- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
-+ PATH_TOOL_YASM ?= /usr/bin
- endif
-
- # XPCOM setup for all but win32.
-@@ -1194,7 +1194,7 @@
- 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/localconf-kmk.dpatch
===================================================================
--- trunk/debian/patches/localconf-kmk.dpatch 2007-10-09 12:19:11 UTC (rev 66)
+++ trunk/debian/patches/localconf-kmk.dpatch 2007-10-09 12:33:33 UTC (rev 67)
@@ -1,18 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-configure.dpatch by Patrick Winnertz <patrick.winnertz at skolelinux.org>
-##
-#DP: Don't build the module for testing and don't build any guest additions
-#DP: both depends on kernel headers, which are atm not available
-
- at DPATCH@
---- /dev/null 2013-04-05 12:00:39.992030371 +0200
-+++ ./LocalConfig.kmk 2007-09-06 10:16:51.000000000 +0200
-@@ -0,0 +1,8 @@
-+VBOX_WITH_VBOXDRV =
-+VBOX_WITH_LINUX_ONLY =
-+VBOX_ADDITIONS_LINUX_ONLY =
-+VBOX_WITH_INSTALLER =
-+VBOX_WITH_LINUX_ADDITIONS =
-+VBOX_WITH_TESTCASES =
-+VBOX_WITH_TESTSUITE =
-+VBOX_WITH_USB =
More information about the Pkg-virtualbox-commits
mailing list