Fixed included, tar, zlib on Dyson

4 files changed, 66 insertions, 0 deletions

diff --git a/debian/patches/dyson-includes.patch b/debian/patches/dyson-includes.patch
new file mode 100644
index 000000000..c777291cf
--- /dev/null
+++ b/debian/patches/dyson-includes.patch
@@ -0,0 +1,25 @@
+Index: virtualbox/Config.kmk
+===================================================================
+--- virtualbox.orig/Config.kmk	2014-06-05 11:55:41.646636304 +0400
++++ virtualbox/Config.kmk	2014-06-05 12:49:17.791810962 +0400
+@@ -3331,7 +3331,7 @@
+ 
+ ifeq ($(KBUILD_TARGET),solaris)
+ ## The Solaris /usr/platform/i86pc/include and /usr/include directories.
+-VBOX_SOLARIS_SYS_INCS ?= /usr/platform/i86pc/include /usr/include
++VBOX_SOLARIS_SYS_INCS ?= /usr/include/illumos /usr/include
+ 
+ TEMPLATE_VBOXR0DRV_TOOL                = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBOXR0DRV_DEFS               += _MACHDEP _KERNEL _STRICT_STDC
+Index: virtualbox/src/VBox/Devices/Makefile.kmk
+===================================================================
+--- virtualbox.orig/src/VBox/Devices/Makefile.kmk	2014-06-05 11:14:30.713370360 +0400
++++ virtualbox/src/VBox/Devices/Makefile.kmk	2014-06-05 14:11:30.253054492 +0400
+@@ -115,6 +115,7 @@
+  VBoxDD_INCS             = \
+  	build \
+  	Network/slirp
++ VBoxDD_INCS.solaris     += /usr/include/illumos
+  VBoxDD_DEFS             = \
+  	VBOX_ACPI \
+  	VBOX_HGCM_HOST_CODE \
diff --git a/debian/patches/dyson-tar.patch b/debian/patches/dyson-tar.patch
new file mode 100644
index 000000000..691d19ed5
--- /dev/null
+++ b/debian/patches/dyson-tar.patch
@@ -0,0 +1,16 @@
+Index: virtualbox/Config.kmk
+===================================================================
+--- virtualbox.orig/Config.kmk	2014-06-05 12:49:17.791810962 +0400
++++ virtualbox/Config.kmk	2014-06-05 15:06:10.115009485 +0400
+@@ -1833,9 +1833,9 @@
+ VBOX_DEF_2_LAZY_LOAD ?= $(PATH_OBJ)/VBoxDef2LazyLoad/VBoxDef2LazyLoad$(HOSTSUFF_EXE)
+ 
+ # GNU tar if present.
+-if1of ($(KBUILD_TARGET), linux os2 win)
++if1of ($(KBUILD_TARGET), linux os2 win solaris)
+  VBOX_GTAR ?= tar
+-else if1of ($(KBUILD_TARGET), freebsd solaris)
++else if1of ($(KBUILD_TARGET), freebsd)
+  VBOX_GTAR ?= gtar
+ endif
+ 
diff --git a/debian/patches/dyson-zlib.patch b/debian/patches/dyson-zlib.patch
new file mode 100644
index 000000000..b3bfe83d3
--- /dev/null
+++ b/debian/patches/dyson-zlib.patch
@@ -0,0 +1,22 @@
+Index: virtualbox/Config.kmk
+===================================================================
+--- virtualbox.orig/Config.kmk	2014-06-05 11:53:50.614360757 +0400
++++ virtualbox/Config.kmk	2014-06-05 11:55:41.646636304 +0400
+@@ -2774,7 +2774,7 @@
+ SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
+ 
+ SDK_VBOX_ZLIB         = .
+-if1of ($(KBUILD_TARGET), os2 solaris win)
++if1of ($(KBUILD_TARGET), os2 win)
+  SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
+  SDK_VBOX_ZLIB_LIBS  ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
+ else
+@@ -2785,7 +2785,7 @@
+ 
+ SDK_VBOX_ZLIB-x86    = .
+ SDK_VBOX_ZLIB-x86_EXTENDS = VBOX_ZLIB
+-if1of ($(KBUILD_TARGET), os2 solaris win)
++if1of ($(KBUILD_TARGET), os2 win)
+  SDK_VBOX_ZLIB_LIBS-x86  ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
+ endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1df034011..a6320429f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,6 @@ dyson-ld-target.patch
 dyson-sunld-for-kernel.patch
 dyson-vboxvideo_drv.patch
 dyson-icons.patch
+dyson-zlib.patch
+dyson-includes.patch
+dyson-tar.patch