[Pkg-virtualbox-commits] r108 - tags tags/1.5.2-dfsg2-1 tags/1.5.2-dfsg2-1/patches trunk/debian trunk/debian/patches
meskes at alioth.debian.org
meskes at alioth.debian.org
Tue Nov 13 13:51:37 UTC 2007
Author: meskes
Date: 2007-11-13 13:51:36 +0000 (Tue, 13 Nov 2007)
New Revision: 108
Added:
tags/1.5.2-dfsg2-1/
tags/1.5.2-dfsg2-1/patches/08-no-kernel.dpatch
trunk/debian/patches/08-no-kernel.dpatch
Modified:
tags/1.5.2-dfsg2-1/changelog
tags/1.5.2-dfsg2-1/patches/00list
tags/1.5.2-dfsg2-1/rules
trunk/debian/changelog
trunk/debian/patches/00list
trunk/debian/rules
Log:
Released 1.5.2-dfsg2-1
Copied: tags/1.5.2-dfsg2-1 (from rev 107, trunk/debian)
Modified: tags/1.5.2-dfsg2-1/changelog
===================================================================
--- trunk/debian/changelog 2007-11-09 21:15:31 UTC (rev 107)
+++ tags/1.5.2-dfsg2-1/changelog 2007-11-13 13:51:36 UTC (rev 108)
@@ -15,8 +15,9 @@
* Provide programs with upstream upper/lower case mix as used by upstream.
* Added linux additions in two seperate packages, closes: #440517, #449315
* Install vboxnet.sh as init script.
+ * Changed build system to work wihtou kernel sources.
- -- Michael Meskes <meskes at debian.org> Tue, 06 Nov 2007 20:26:35 +0100
+ -- Michael Meskes <meskes at debian.org> Tue, 12 Nov 2007 20:26:35 +0100
virtualbox-ose (1.5.2-dfsg-2) unstable; urgency=low
Modified: tags/1.5.2-dfsg2-1/patches/00list
===================================================================
--- trunk/debian/patches/00list 2007-11-09 21:15:31 UTC (rev 107)
+++ tags/1.5.2-dfsg2-1/patches/00list 2007-11-13 13:51:36 UTC (rev 108)
@@ -5,4 +5,5 @@
05-vboxdrv-references.dpatch
06-vboxadd-udev.dpatch
07-xsession.dpatch
+08-no-kernel.dpatch
Added: tags/1.5.2-dfsg2-1/patches/08-no-kernel.dpatch
===================================================================
--- tags/1.5.2-dfsg2-1/patches/08-no-kernel.dpatch (rev 0)
+++ tags/1.5.2-dfsg2-1/patches/08-no-kernel.dpatch 2007-11-13 13:51:36 UTC (rev 108)
@@ -0,0 +1,152 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08-no-kernel.dpatch by <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build without kernel sources.
+
+ at DPATCH@
+
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/Config.kmk virtualbox-ose-1.5.2-dfsg2/Config.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/Config.kmk 2007-10-18 14:16:17.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/Config.kmk 2007-11-13 10:04:00.000000000 +0100
+@@ -630,7 +630,7 @@
+ #
+ # Note! The __SOMETHING__ #defines are deprecated as they violate the C/C++ specs.
+ #
+-INCS += $(PATH_ROOT)/include $(PATH_OUT)
++INCS += $(PATH_ROOT)/include /usr/include $(PATH_OUT)
+ DEFS += VBOX
+ DEFS.debug := DEBUG DEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) DEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))
+ DEFS.profile = VBOX_WITH_STATISTICS
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk 2007-11-12 17:00:39.000000000 +0100
+@@ -24,7 +24,7 @@
+ vboxadd-timesync_SOURCES = \
+ vboxadd_timesync.c \
+ supc++.c
+-vboxadd-timesync_LIBS = \
++vboxadd-timesync_LIBS = #\
+ $(PATH_LIB)/RuntimeLnx32GuestR3.a
+ vboxadd-timesync_DEFS = _GNU_SOURCE
+
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk 2007-11-13 09:58:46.000000000 +0100
+@@ -17,10 +17,10 @@
+ DEPTH = ../../../../..
+ include $(PATH_KBUILD)/header.kmk
+
+ INSTALLS = vboxmod-bin vboxmod-sh
+-ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+-SYSMODS = vboxadd
+-endif
++#ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
++#SYSMODS = vboxadd
++#endif
+
+ #
+ # Populate FILES_VBOXADD_NOBIN and FILES_VBOXADD_BIN
+@@ -38,12 +38,12 @@
+ #
+ # The module (for syntax checking).
+ #
+-vboxadd_TEMPLATE = VBOXLNX32GUESTR0
+-vboxadd_DEFS = KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM
+-vboxadd_LIBS = $(PATH_LIB)/VBoxGuestLibBaseLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
+-vboxadd_SOURCES = vboxmod.c cmc.c hgcmcall.c
+-vboxadd_INCS = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
+-vboxadd_NOINST = 1
++#vboxadd_TEMPLATE = VBOXLNX32GUESTR0
++#vboxadd_DEFS = KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM
++#vboxadd_LIBS = $(PATH_LIB)/VBoxGuestLibBaseLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
++#vboxadd_SOURCES = vboxmod.c cmc.c hgcmcall.c
++#vboxadd_INCS = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
++#vboxadd_NOINST = 1
+
+ include $(PATH_KBUILD)/footer.kmk
+
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-11-13 09:39:34.000000000 +0100
+@@ -17,9 +17,9 @@
+ DEPTH = ../../../../..
+ include $(PATH_KBUILD)/header.kmk
+
+-ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+-SYSMODS = vboxvfs
+-endif
++#ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
++#SYSMODS = vboxvfs
++#endif
+ PROGRAMS = mountvboxsf
+ INSTALLS = vboxvfs-bin vboxvfs-sh
+
+@@ -42,23 +42,23 @@
+ #
+ # The module (for syntax checking).
+ #
+-vboxvfs_TEMPLATE = VBOXLNX32GUESTR0
+-vboxvfs_DEFS := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
+-vboxvfs_LIBS = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
+-vboxvfs_SOURCES = vfsmod.c vfs-utils.c
+-vboxvfs_NOINST = 1
+-vboxvfs_CFLAGS += -fshort-wchar
+-vboxvfs_INCS += \
++#vboxvfs_TEMPLATE = VBOXLNX32GUESTR0
++#vboxvfs_DEFS := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
++#vboxvfs_LIBS = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
++#vboxvfs_SOURCES = vfsmod.c vfs-utils.c
++#vboxvfs_NOINST = 1
++#vboxvfs_CFLAGS += -fshort-wchar
++#vboxvfs_INCS += \
+ ../../common/VBoxGuestLib \
+ $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
+
+ # detect fc6 2.6.18
+-vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
++#vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
+ $(if $(wildcard $(inc)/linux/utsrelease.h),\
+ $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
+ then echo yes; fi),KERNEL_FC6,),))
+ # detect rhel5 2.6.18
+-vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
++#vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
+ $(if $(wildcard $(inc)/linux/utsrelease.h),\
+ $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
+ then echo yes; fi),KERNEL_FC6,),))
+Binärdateien technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/xclient/.clipboard.cpp.swp and virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/xclient/.clipboard.cpp.swp sind verschieden.
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk 2007-11-13 09:29:46.000000000 +0100
+@@ -52,12 +52,12 @@
+ endif
+
+ # Include sub-makefiles.
+-include $(PATH_SUB_CURRENT)/common/Makefile.kmk
+-ifdef VBOX_WITH_WIN32_ADDITIONS
+- ifndef VBOX_REMOTE_WIN32_ADDITIONS_BUILD
+- include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk
+- endif
+-endif
++#include $(PATH_SUB_CURRENT)/common/Makefile.kmk
++#ifdef VBOX_WITH_WIN32_ADDITIONS
++# ifndef VBOX_REMOTE_WIN32_ADDITIONS_BUILD
++# include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk
++# endif
++#endif
+
+ ifdef VBOX_WITH_LINUX_ADDITIONS
+ SUBDIRS += linux
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk 2007-08-30 17:16:25.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk 2007-11-13 09:50:48.000000000 +0100
+@@ -37,7 +37,7 @@
+ ifdef VBOX_WITH_LINUX_ADDITIONS
+ LIBRARIES += RuntimeLnx32GuestR3
+ ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+- LIBRARIES += RuntimeLnx32GuestR0
++ #LIBRARIES += RuntimeLnx32GuestR0
+ endif
+ endif
+ ifdef VBOX_WITH_OS2_ADDITIONS
Modified: tags/1.5.2-dfsg2-1/rules
===================================================================
--- trunk/debian/rules 2007-11-09 21:15:31 UTC (rev 107)
+++ tags/1.5.2-dfsg2-1/rules 2007-11-13 13:51:36 UTC (rev 108)
@@ -72,7 +72,6 @@
dh_testroot
dh_clean -k
dh_installdirs
- dh_installinit
install -D -m 0644 $(CURDIR)/debian/lintian/$(sname) \
$(CURDIR)/debian/$(sname)/usr/share/lintian/overrides/$(sname)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-11-09 21:15:31 UTC (rev 107)
+++ trunk/debian/changelog 2007-11-13 13:51:36 UTC (rev 108)
@@ -15,8 +15,9 @@
* Provide programs with upstream upper/lower case mix as used by upstream.
* Added linux additions in two seperate packages, closes: #440517, #449315
* Install vboxnet.sh as init script.
+ * Changed build system to work wihtou kernel sources.
- -- Michael Meskes <meskes at debian.org> Tue, 06 Nov 2007 20:26:35 +0100
+ -- Michael Meskes <meskes at debian.org> Tue, 12 Nov 2007 20:26:35 +0100
virtualbox-ose (1.5.2-dfsg-2) unstable; urgency=low
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2007-11-09 21:15:31 UTC (rev 107)
+++ trunk/debian/patches/00list 2007-11-13 13:51:36 UTC (rev 108)
@@ -5,4 +5,5 @@
05-vboxdrv-references.dpatch
06-vboxadd-udev.dpatch
07-xsession.dpatch
+08-no-kernel.dpatch
Added: trunk/debian/patches/08-no-kernel.dpatch
===================================================================
--- trunk/debian/patches/08-no-kernel.dpatch (rev 0)
+++ trunk/debian/patches/08-no-kernel.dpatch 2007-11-13 13:51:36 UTC (rev 108)
@@ -0,0 +1,152 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08-no-kernel.dpatch by <meskes at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build without kernel sources.
+
+ at DPATCH@
+
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/Config.kmk virtualbox-ose-1.5.2-dfsg2/Config.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/Config.kmk 2007-10-18 14:16:17.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/Config.kmk 2007-11-13 10:04:00.000000000 +0100
+@@ -630,7 +630,7 @@
+ #
+ # Note! The __SOMETHING__ #defines are deprecated as they violate the C/C++ specs.
+ #
+-INCS += $(PATH_ROOT)/include $(PATH_OUT)
++INCS += $(PATH_ROOT)/include /usr/include $(PATH_OUT)
+ DEFS += VBOX
+ DEFS.debug := DEBUG DEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) DEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))
+ DEFS.profile = VBOX_WITH_STATISTICS
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/daemon/Makefile.kmk 2007-11-12 17:00:39.000000000 +0100
+@@ -24,7 +24,7 @@
+ vboxadd-timesync_SOURCES = \
+ vboxadd_timesync.c \
+ supc++.c
+-vboxadd-timesync_LIBS = \
++vboxadd-timesync_LIBS = #\
+ $(PATH_LIB)/RuntimeLnx32GuestR3.a
+ vboxadd-timesync_DEFS = _GNU_SOURCE
+
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/module/Makefile.kmk 2007-11-13 09:58:46.000000000 +0100
+@@ -17,10 +17,10 @@
+ DEPTH = ../../../../..
+ include $(PATH_KBUILD)/header.kmk
+
+ INSTALLS = vboxmod-bin vboxmod-sh
+-ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+-SYSMODS = vboxadd
+-endif
++#ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
++#SYSMODS = vboxadd
++#endif
+
+ #
+ # Populate FILES_VBOXADD_NOBIN and FILES_VBOXADD_BIN
+@@ -38,12 +38,12 @@
+ #
+ # The module (for syntax checking).
+ #
+-vboxadd_TEMPLATE = VBOXLNX32GUESTR0
+-vboxadd_DEFS = KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM
+-vboxadd_LIBS = $(PATH_LIB)/VBoxGuestLibBaseLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
+-vboxadd_SOURCES = vboxmod.c cmc.c hgcmcall.c
+-vboxadd_INCS = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
+-vboxadd_NOINST = 1
++#vboxadd_TEMPLATE = VBOXLNX32GUESTR0
++#vboxadd_DEFS = KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBGL_VBOXGUEST EXPORT_SYMTAB VBGL_HGCM VBOX_HGCM
++#vboxadd_LIBS = $(PATH_LIB)/VBoxGuestLibBaseLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
++#vboxadd_SOURCES = vboxmod.c cmc.c hgcmcall.c
++#vboxadd_INCS = $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
++#vboxadd_NOINST = 1
+
+ include $(PATH_KBUILD)/footer.kmk
+
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/sharedfolders/Makefile.kmk 2007-11-13 09:39:34.000000000 +0100
+@@ -17,9 +17,9 @@
+ DEPTH = ../../../../..
+ include $(PATH_KBUILD)/header.kmk
+
+-ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+-SYSMODS = vboxvfs
+-endif
++#ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
++#SYSMODS = vboxvfs
++#endif
+ PROGRAMS = mountvboxsf
+ INSTALLS = vboxvfs-bin vboxvfs-sh
+
+@@ -42,23 +42,23 @@
+ #
+ # The module (for syntax checking).
+ #
+-vboxvfs_TEMPLATE = VBOXLNX32GUESTR0
+-vboxvfs_DEFS := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
+-vboxvfs_LIBS = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
+-vboxvfs_SOURCES = vfsmod.c vfs-utils.c
+-vboxvfs_NOINST = 1
+-vboxvfs_CFLAGS += -fshort-wchar
+-vboxvfs_INCS += \
++#vboxvfs_TEMPLATE = VBOXLNX32GUESTR0
++#vboxvfs_DEFS := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
++#vboxvfs_LIBS = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
++#vboxvfs_SOURCES = vfsmod.c vfs-utils.c
++#vboxvfs_NOINST = 1
++#vboxvfs_CFLAGS += -fshort-wchar
++#vboxvfs_INCS += \
+ ../../common/VBoxGuestLib \
+ $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
+
+ # detect fc6 2.6.18
+-vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
++#vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
+ $(if $(wildcard $(inc)/linux/utsrelease.h),\
+ $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
+ then echo yes; fi),KERNEL_FC6,),))
+ # detect rhel5 2.6.18
+-vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
++#vboxvfs_DEFS += $(foreach inc,$(VBOX_LINUX_INCS),\
+ $(if $(wildcard $(inc)/linux/utsrelease.h),\
+ $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
+ then echo yes; fi),KERNEL_FC6,),))
+Binärdateien technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/xclient/.clipboard.cpp.swp and virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/linux/xclient/.clipboard.cpp.swp sind verschieden.
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk 2007-08-30 17:16:27.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Additions/Makefile.kmk 2007-11-13 09:29:46.000000000 +0100
+@@ -52,12 +52,12 @@
+ endif
+
+ # Include sub-makefiles.
+-include $(PATH_SUB_CURRENT)/common/Makefile.kmk
+-ifdef VBOX_WITH_WIN32_ADDITIONS
+- ifndef VBOX_REMOTE_WIN32_ADDITIONS_BUILD
+- include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk
+- endif
+-endif
++#include $(PATH_SUB_CURRENT)/common/Makefile.kmk
++#ifdef VBOX_WITH_WIN32_ADDITIONS
++# ifndef VBOX_REMOTE_WIN32_ADDITIONS_BUILD
++# include $(PATH_SUB_CURRENT)/WINNT/Makefile.kmk
++# endif
++#endif
+
+ ifdef VBOX_WITH_LINUX_ADDITIONS
+ SUBDIRS += linux
+diff --exclude .svn -ruN technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk
+--- technik/sources/archive/pkg-virtualbox/build-area/virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk 2007-08-30 17:16:25.000000000 +0200
++++ virtualbox-ose-1.5.2-dfsg2/src/VBox/Runtime/Makefile.kmk 2007-11-13 09:50:48.000000000 +0100
+@@ -37,7 +37,7 @@
+ ifdef VBOX_WITH_LINUX_ADDITIONS
+ LIBRARIES += RuntimeLnx32GuestR3
+ ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+- LIBRARIES += RuntimeLnx32GuestR0
++ #LIBRARIES += RuntimeLnx32GuestR0
+ endif
+ endif
+ ifdef VBOX_WITH_OS2_ADDITIONS
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2007-11-09 21:15:31 UTC (rev 107)
+++ trunk/debian/rules 2007-11-13 13:51:36 UTC (rev 108)
@@ -72,7 +72,6 @@
dh_testroot
dh_clean -k
dh_installdirs
- dh_installinit
install -D -m 0644 $(CURDIR)/debian/lintian/$(sname) \
$(CURDIR)/debian/$(sname)/usr/share/lintian/overrides/$(sname)
More information about the Pkg-virtualbox-commits
mailing list