Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4847 from Rmys/master

Browse Source 
virualbox:ver.bump
This commit is contained in:
Rmys
2018-05-12 13:15:15 +03:00
committed by GitHub
parent 2dc33bdd77 9e7644dadf
commit 4aa0052532
4 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/virtualbox/files/002-dri-driver-path.patch
+8 -10
View File
@@ -1,19 +1,18 @@
diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
index 92b4ffc..1a1c467 100644
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
@@ -56,24 +56,8 @@ typedef enum {
diff -Nuar a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2018-05-09 19:32:17.000000000 +0300
+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2018-05-11 23:24:22.415626074 +0300
@@ -57,23 +57,8 @@
//#define DEBUG_DRI_CALLS
-/// @todo this could be different...
/// @todo this could be different...
-#ifdef RT_ARCH_AMD64
-# ifdef RT_OS_FREEBSD
-# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri"
-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
-# else
-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri"
-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#else
-# ifdef RT_OS_FREEBSD
@@ -21,8 +20,7 @@ index 92b4ffc..1a1c467 100644
-# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/"
-# else
-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri"
+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
-# endif
-#endif
hardware/virtualization/virtualbox/files/010-linux-4.16-mount-fixes.patch
+35
View File
@@ -0,0 +1,35 @@
This ghetto patch attempts to fix shared folder automounting for guests running
Linux 4.16, and also suggests an alternative to mount.vboxsf.
diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
--- VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-02-26 17:57:30.000000000 +0200
+++ VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 2018-04-07 21:00:05.785735622 +0300
@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
"vboxsf",
fFlags,
&mntinf);
+ if (r == -1 && errno == EINVAL)
+ {
+ /* Mainline vboxsf accepts regular mount opts. */
+ char mount_opts[1024];
+ snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", mntinf.gid);
+ r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, mount_opts);
+ }
if (r == 0)
{
VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was mounted to '%s'\n", pszShareName, pszMountPoint);
diff -uprb VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c
--- VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 2018-02-26 17:57:34.000000000 +0200
+++ VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 2018-04-07 21:39:38.121577588 +0300
@@ -485,6 +485,11 @@ main(int argc, char **argv)
* to keep this code here slick without having VbglR3.
*/
err = mount(host_name, mount_point, "vboxsf", flags, &mntinf);
+ if (err == -1 && errno == EINVAL)
+ {
+ /* The mount.vboxsf helper should not be used with mainline vboxsf. */
+ panic("mount.vboxsf cannot be used with mainline vboxsf; instead use:\n\n mount -cit vboxsf NAME MOUNTPOINT\n\n");
+ }
if (err == -1 && errno == EPROTO)
{
/* Sometimes the mount utility messes up the share name. Try to
hardware/virtualization/virtualbox/files/LocalConfig.kmk
+1
View File
@@ -5,6 +5,7 @@ VBOX_WITH_VALIDATIONKIT :=
# no legacy X.org - use KMS
VBOX_USE_SYSTEM_XORG_HEADERS = 1
VBOX_USE_SYSTEM_GL_HEADERS=true
VBOX_NO_LEGACY_XORG_X11 = 1
# PisiLinux path
hardware/virtualization/virtualbox/pspec.xml
+10 -2
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>A powerful virtualization program</Summary>
<Description>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.</Description>
<Archive sha1sum="346bc63fa126e33a1b7017b769b429bbc39fa397" type="tarbz2">http://download.virtualbox.org/virtualbox/5.2.10/VirtualBox-5.2.10.tar.bz2</Archive>
<Archive sha1sum="37c615c480fbb64b70be9f333f3fd96379982de3" type="tarbz2">http://download.virtualbox.org/virtualbox/5.2.12/VirtualBox-5.2.12.tar.bz2</Archive>
<BuildDependencies>
<Dependency>dev86</Dependency>
<Dependency>cdrkit</Dependency>
@@ -57,13 +57,14 @@
<Patches>
<Patch level="1">wrapper.patch</Patch>
<Patch level="1">002-dri-driver-path.patch</Patch>
<Patch level="1">003-ogl-include-new.patch</Patch>
<!-- <Patch level="1">003-ogl-include-new.patch</Patch> -->
<Patch level="1">005-gsoap-build.patch</Patch>
<Patch level="1">006-rdesktop-vrdp-keymap-path.patch</Patch>
<Patch level="1">008-root-window.patch</Patch>
<!-- <Patch level="1">009-include-path.patch</Patch> -->
<Patch level="1">python.patch</Patch>
<Patch level="1">008-no-vboxvideo.patch</Patch>
<Patch level="1">010-linux-4.16-mount-fixes.patch</Patch>
</Patches>
</Source>
@@ -153,6 +154,13 @@
</Package>
<History>
<Update release="17">
<Date>2018-05-10</Date>
<Version>5.2.12</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="16">
<Date>2018-04-18</Date>
<Version>5.2.10</Version>