fix build with kernel-4.3
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
#
|
||||
# https://forums.virtualbox.org/viewtopic.php?uid=80969&f=7&t=70150&start=0
|
||||
# kernel 4.3-rc1 heads up
|
||||
#
|
||||
--- ./vboxdrv/linux/SUPDrv-linux.c.orig 2015-09-25 20:56:04.704532570 -0700
|
||||
+++ ./vboxdrv/linux/SUPDrv-linux.c 2015-09-25 20:57:17.265521751 -0700
|
||||
@@ -485,6 +485,7 @@
|
||||
* opened, at least we'll blindly assume that here.
|
||||
*/
|
||||
#ifdef CONFIG_VBOXDRV_AS_MISC
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
|
||||
rc = misc_deregister(&gMiscDeviceUsr);
|
||||
if (rc < 0)
|
||||
{
|
||||
@@ -495,6 +496,10 @@
|
||||
{
|
||||
Log(("misc_deregister failed with rc=%#x on vboxdrv\n", rc));
|
||||
}
|
||||
+#else
|
||||
+ misc_deregister(&gMiscDeviceUsr);
|
||||
+ misc_deregister(&gMiscDeviceSys);
|
||||
+#endif
|
||||
#else /* !CONFIG_VBOXDRV_AS_MISC */
|
||||
# ifdef CONFIG_DEVFS_FS
|
||||
/*
|
||||
--- ./vboxnetadp/linux/VBoxNetAdp-linux.c.orig 2015-09-25 20:55:42.309667865 -0700
|
||||
+++ ./vboxnetadp/linux/VBoxNetAdp-linux.c 2015-09-25 20:58:49.331034237 -0700
|
||||
@@ -436,7 +436,11 @@
|
||||
|
||||
vboxNetAdpShutdown();
|
||||
/* Remove control device */
|
||||
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
|
||||
rc = misc_deregister(&g_CtlDev);
|
||||
+ #else
|
||||
+ misc_deregister(&g_CtlDev);
|
||||
+ #endif
|
||||
if (rc < 0)
|
||||
{
|
||||
printk(KERN_ERR "misc_deregister failed with rc=%x\n", rc);
|
||||
@@ -14,14 +14,17 @@
|
||||
<Description>This package provides the kernel support for VirtualBox.</Description>
|
||||
<Archive sha1sum="14e3d8630f779dc1349d9aa488fa7e6604b9ba3e" type="tarxz">http://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.0.4.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency version="4.2.6">kernel-module-headers</Dependency>
|
||||
<Dependency version="4.3.0">kernel-module-headers</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>vbox_linux-4.3.diff</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>module-virtualbox</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency version="4.2.6">kernel</Dependency>
|
||||
<Dependency version="4.3.0">kernel</Dependency>
|
||||
<Dependency version="current">module-virtualbox-userspace</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
@@ -47,6 +50,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="58">
|
||||
<Date>2015-12-01</Date>
|
||||
<Version>5.0.4</Version>
|
||||
<Comment>Rebuild for kernel-4.3.0.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="57">
|
||||
<Date>2015-11-11</Date>
|
||||
<Version>5.0.4</Version>
|
||||
|
||||
Reference in New Issue
Block a user