[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (76446ee40d7538d5ff6ab20b663c811c815231ee)

Ladislav Hagara scm at sourcemage.org
Wed Aug 6 17:08:13 EDT 2008


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 kernels/virtualbox-module/DETAILS    |    2 -
 kernels/virtualbox-module/HISTORY    |    3 ++
 utils/virtualbox/DETAILS             |    7 +++---
 utils/virtualbox/HISTORY             |    5 ++++
 utils/virtualbox/PRE_BUILD           |    3 ++
 utils/virtualbox/attachment-0001.txt |   35 ++++++++++++++++++++++++++++++++++
 utils/virtualbox/attachment.txt      |   36 +++++++++++++++++++++++++++++++++++
 7 files changed, 87 insertions(+), 4 deletions(-)

New commits:
commit 76446ee40d7538d5ff6ab20b663c811c815231ee
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    virtualbox-module 1.6.4

commit b56395ab8cb84e4b7b4bfba2d816dad5b4d4de73
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    virtualbox 1.6.4
    I am able to compile it only with GCC_VERSION=3.4

diff --git a/kernels/virtualbox-module/DETAILS b/kernels/virtualbox-module/DETAILS
index 548c5fa..2c0ba2d 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
            SPELL=virtualbox-module
-         VERSION=1.6.2
+         VERSION=1.6.4
           SOURCE=virtualbox-module-$VERSION.tar.gz
    SOURCE_IGNORE=volatile
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY b/kernels/virtualbox-module/HISTORY
index 68e40e4..d52203c 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2008-08-06 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.4
+
 2008-06-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6.2, uses SOURCE generated by virtualbox spell
 	* DEPENDS: added virtualbox
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 17217a7..0b52900 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,10 +1,11 @@
            SPELL=virtualbox
-         VERSION=1.6.2
-      PATCHLEVEL=2
+         VERSION=1.6.4
+     GCC_VERSION=3.4
+      PATCHLEVEL=0
           SOURCE=VirtualBox-$VERSION-OSE.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-$VERSION
    SOURCE_URL[0]=http://www.virtualbox.org/download/$VERSION/$SOURCE
-SOURCE_HASH=sha512:63dc074dbcd8f7e8f69fc7d0d3ae04e28ce30abe00aed06e1f957197a931928d58335aeea2e7899f831db79baa81962c18e84ccd4c73bef58f00cbb0e91e74d2
+SOURCE_HASH=sha512:ff3c23af223d73c1d30846029a0d6bf3a40b6b46877084713088f33f8bead332a69797f89300913cc4a469898340b93193d4fa2a3690196c1d48c4e7dc7736b2
       LICENSE[0]=GPL
         WEB_SITE=http://www.virtualbox.org/
          ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index c317229..b50471a 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,8 @@
+2008-08-06 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.4, GCC_VERSION=3.4
+	* attachment.txt, attachment-0001.txt, PRE_BUILD: added patches from
+	  http://vbox.innotek.de/pipermail/vbox-dev/2008-August/000707.html
+
 2008-07-01 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: removed GCC_VERSION as gcc34 is not needed to compile the
 	  whole spell, but only to compile the dynamic recompiler part of
diff --git a/utils/virtualbox/PRE_BUILD b/utils/virtualbox/PRE_BUILD
index 3559312..94c335d 100755
--- a/utils/virtualbox/PRE_BUILD
+++ b/utils/virtualbox/PRE_BUILD
@@ -1,6 +1,9 @@
 default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
 
+cp $SPELL_DIRECTORY/attachment.txt      src/apps/Makefile.kmk         &&
+cp $SPELL_DIRECTORY/attachment-0001.txt src/apps/tunctl/Makefile.kmk  &&
+
 mkdir FAKEQTDIR &&
 
 ln -s $TRACK_ROOT/usr/include/qt  $SOURCE_DIRECTORY/FAKEQTDIR/include  &&
diff --git a/utils/virtualbox/attachment-0001.txt b/utils/virtualbox/attachment-0001.txt
new file mode 100644
index 0000000..0169c8d
--- /dev/null
+++ b/utils/virtualbox/attachment-0001.txt
@@ -0,0 +1,35 @@
+# $Id: Makefile.kmk 31342 2008-05-28 08:44:35Z frank $
+## @file
+# Makefile for VBoxTunctl, which is identical to tunctl from Usermode Linux
+# except for the name.
+#
+
+#
+# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+#
+# 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.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+# Clara, CA 95054 USA or visit http://www.sun.com if you need
+# additional information or have any questions.
+#
+
+DEPTH = ../../..
+include $(KBUILD_PATH)/header.kmk
+
+ifneq ($(KBUILD_HOST),linux)
+$(error "VBoxTunctl can only be built on Linux!")
+endif
+
+PROGRAMS       = VBoxTunctl
+
+VBoxTunctl_TEMPLATE = VBOXR3EXE
+VBoxTunctl_SOURCES  = tunctl.c
+
+include $(KBUILD_PATH)/footer.kmk
diff --git a/utils/virtualbox/attachment.txt b/utils/virtualbox/attachment.txt
new file mode 100644
index 0000000..3c4da94
--- /dev/null
+++ b/utils/virtualbox/attachment.txt
@@ -0,0 +1,36 @@
+# $Id: Makefile.kmk 34052 2008-08-04 17:27:28Z klaus $
+## @file
+# Top-level makefile for the external apps.
+#
+
+#
+# Copyright (C) 2006-2007 Sun Microsystems, Inc.
+#
+# 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.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+# Clara, CA 95054 USA or visit http://www.sun.com if you need
+# additional information or have any questions.
+#
+
+DEPTH = ../..
+include $(KBUILD_PATH)/header.kmk
+
+ifdef VBOX_WITH_KCHMVIEWER
+ifneq ($(wildcard kchmviewer-2.6),)
+SUBDIRS.linux = kchmviewer-2.6
+endif
+endif
+
+ifneq ($(wildcard tunctl),)
+SUBDIRS.linux += tunctl
+endif
+
+include $(KBUILD_PATH)/rules.kmk
+



More information about the SM-Commit mailing list