diff --git a/hardware/virtualization/virtualbox/actions.py b/hardware/virtualization/virtualbox/actions.py index cd461b98bc..a6b0d45039 100644 --- a/hardware/virtualization/virtualbox/actions.py +++ b/hardware/virtualization/virtualbox/actions.py @@ -15,8 +15,8 @@ VBoxDataDir = "/usr/share/virtualbox" KDIR = kerneltools.getKernelVersion() def setup(): - #pisitools.dosed("LocalConfig.kmk", "__VBOXLIBDIR__", VBoxLibDir) - #pisitools.dosed("LocalConfig.kmk", "__VBOXDATADIR__", VBoxDataDir) + pisitools.dosed("LocalConfig.kmk", "__VBOXLIBDIR__", VBoxLibDir) + pisitools.dosed("LocalConfig.kmk", "__VBOXDATADIR__", VBoxDataDir) shelltools.echo("vbox.cfg", "INSTALL_DIR=%s" % VBoxLibDir) @@ -94,7 +94,7 @@ def install(): pisitools.dolib("additions/VBoxOGL*") pisitools.dosym("../../../VBoxOGL.so", "/usr/lib/xorg/modules/dri/vboxvideo_dri.so") - pisitools.insinto("/usr/lib/xorg/modules/drivers", "additions/vboxvideo_drv_%s.so" % XorgVersion, "vboxvideo_drv.so") + pisitools.insinto("/usr/lib/xorg/modules/drivers", "additions/vboxvideo_drv_system.so", "vboxvideo.so") #pisitools.insinto("/usr/lib/xorg/modules/input", "additions/vboxmouse_drv_%s.so" % XorgVersion, "vboxmouse_drv.so") # Python bindings diff --git a/hardware/virtualization/virtualbox/comar/package.py b/hardware/virtualization/virtualbox/comar/package.py index 1477f975bf..3babac2940 100644 --- a/hardware/virtualization/virtualbox/comar/package.py +++ b/hardware/virtualization/virtualbox/comar/package.py @@ -10,4 +10,5 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease): for _file in files: f = "/usr/lib/virtualbox/%s" % _file os.system("/bin/chown :%s %s" % (vboxgroup, f)) - os.chmod(f, 04510) + os.chmod(f, 04755) + diff --git a/hardware/virtualization/virtualbox/comar/service.py b/hardware/virtualization/virtualbox/comar/service.py new file mode 100644 index 0000000000..4eb05baa87 --- /dev/null +++ b/hardware/virtualization/virtualbox/comar/service.py @@ -0,0 +1,15 @@ +from comar.service import * +import os + +serviceType = "script" + +@synchronized +def start(): + os.system("/sbin/modprobe vboxguest") + os.system("/sbin/modprobe vboxvideo") + os.system("/sbin/modprobe vboxsf") + os.system("/sbin/modprobe vboxdrv") + os.system("/sbin/modprobe VBoxService -f ") + + + diff --git a/hardware/virtualization/virtualbox/files/003-ogl-include-path.patch b/hardware/virtualization/virtualbox/files/003-ogl-include-path.patch index 7f319ec76d..0d5cb6d2d9 100644 --- a/hardware/virtualization/virtualbox/files/003-ogl-include-path.patch +++ b/hardware/virtualization/virtualbox/files/003-ogl-include-path.patch @@ -1,6 +1,8 @@ ---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000 -+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000 -@@ -63,18 +63,12 @@ +Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk +=================================================================== +--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200 ++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200 +@@ -67,18 +67,12 @@ VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ @@ -24,3 +26,18 @@ VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif +@@ -213,10 +207,10 @@ + + if1of ($(KBUILD_TARGET), linux solaris freebsd) + VBoxOGL_LIBS += \ +- $(PATH_STAGE_LIB)/libXcomposite.so \ +- $(PATH_STAGE_LIB)/libXdamage.so \ +- $(PATH_STAGE_LIB)/libXfixes.so \ +- $(PATH_STAGE_LIB)/libXext.so ++ Xcomposite \ ++ Xdamage \ ++ Xfixes \ ++ Xext + ifdef VBoxOGL_FAKEDRI + ifeq ($(KBUILD_TARGET), freebsd) + VBoxOGL_LIBS += \ diff --git a/hardware/virtualization/virtualbox/files/LocalConfig.kmk b/hardware/virtualization/virtualbox/files/LocalConfig.kmk index 5dbfcf7dec..821d905640 100644 --- a/hardware/virtualization/virtualbox/files/LocalConfig.kmk +++ b/hardware/virtualization/virtualbox/files/LocalConfig.kmk @@ -1,9 +1,9 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = 1 -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = +# do not build test cases +VBOX_WITH_TESTCASES := +VBOX_WITH_TESTSUITE := +VBOX_WITH_VALIDATIONKIT := + +# PisiLinux path VBOX_WITH_ORIGIN := VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) @@ -11,11 +11,18 @@ VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS) -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = VBOX_BLD_PYTHON = python VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk + +# do not fail on warning VBOX_GCC_WERR = VBOX_GCC_WARN = + # fix gsoap missing zlib include and produce errors with --as-needed VBOX_GSOAP_CXX_LIBS := gsoapssl++ z + +# use system xorg +VBOX_USE_SYSTEM_XORG_HEADERS = 1 + +# no update request. update are handled via pisi +VBOX_WITH_UPDATE_REQUEST := 0 diff --git a/hardware/virtualization/virtualbox/files/LocalConfig2.kmk b/hardware/virtualization/virtualbox/files/LocalConfig2.kmk new file mode 100644 index 0000000000..5dbfcf7dec --- /dev/null +++ b/hardware/virtualization/virtualbox/files/LocalConfig2.kmk @@ -0,0 +1,21 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = 1 +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox +VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS) +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_BLD_PYTHON = python +VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk +VBOX_GCC_WERR = +VBOX_GCC_WARN = +# fix gsoap missing zlib include and produce errors with --as-needed +VBOX_GSOAP_CXX_LIBS := gsoapssl++ z diff --git a/hardware/virtualization/virtualbox/files/python.patch b/hardware/virtualization/virtualbox/files/python.patch new file mode 100644 index 0000000000..4821a9e828 --- /dev/null +++ b/hardware/virtualization/virtualbox/files/python.patch @@ -0,0 +1,9 @@ +# 2013 © Sébastien Luttringer +--- a/src/VBox/Frontends/VBoxShell/vboxshell.py 2014-01-03 01:38:41.831615590 +0100 ++++ b/src/VBox/Frontends/VBoxShell/vboxshell.py 2014-01-04 04:23:33.884544420 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # $Id: vboxshell.py 49841 2013-12-09 13:32:33Z vboxsync $ + """ diff --git a/hardware/virtualization/virtualbox/files/vboxreload b/hardware/virtualization/virtualbox/files/vboxreload index 7b525674a3..04b6e7b9e3 100644 --- a/hardware/virtualization/virtualbox/files/vboxreload +++ b/hardware/virtualization/virtualbox/files/vboxreload @@ -1,8 +1,8 @@ #!/bin/bash -# vboxreload: shortcut to reload virtualbox modules with DKMS support +# vboxreload: shortcut to reload virtualbox host modules # -# Copyright © 2013 Sébastien Luttringer +# Copyright © 2016 Sébastien Luttringer # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,6 +18,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; } + modules=(vboxnetadp vboxnetflt vboxpci vboxdrv) echo -n 'Unloading modules: ' @@ -26,11 +28,6 @@ for _m in "${modules[@]}"; do done echo -if type -P dkms >/dev/null; then - echo 'DKMS autoinstall' - dkms autoinstall -fi - echo -n 'Loading modules: ' for _m in "${modules[@]}"; do modprobe "$_m" && echo -n "$_m " diff --git a/hardware/virtualization/virtualbox/pspec.xml b/hardware/virtualization/virtualbox/pspec.xml index 21dfde3568..f5da0a1b6a 100644 --- a/hardware/virtualization/virtualbox/pspec.xml +++ b/hardware/virtualization/virtualbox/pspec.xml @@ -12,7 +12,7 @@ app:gui A powerful virtualization program VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things. - http://download.virtualbox.org/virtualbox/5.1.0_BETA2/VirtualBox-5.1.0_BETA2.tar.bz2 + http://download.virtualbox.org/virtualbox/5.1.0_RC1/VirtualBox-5.1.0_RC1.tar.bz2 dev86 cdrkit @@ -58,6 +58,7 @@ 003-ogl-include-path.patch 008-root-window.patch 004-xorg.patch + python.patch @@ -102,6 +103,7 @@ System.Package + System.Service vboxreload @@ -144,6 +146,13 @@ + + 2016-07-17 + 5.1.0_rc1 + Version Bump + Ergün Salman + poyraz76@pisilinux.org + 2016-06-17 5.1.0b