Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=96411aa6a5c4309b9e2697fb1e083f9bec08a1c1
commit 96411aa6a5c4309b9e2697fb1e083f9bec08a1c1 Author: DeX77 <[email protected]> Date: Tue Jan 30 11:42:16 2018 +0100 virtualbox-5.2.6-4-x86_64 * fix build with kernel 4.15 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index ad7ad48..8777493 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -32,7 +32,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver 60-vboxguest.rules \ vboxservice.service \ virtualbox-guest-utils.conf \ - depmod.patch) + depmod.patch \ + kernel-4.15.patch) _F_kernelmod_scriptlet="$startdir/$pkgname.install" Finclude kernel-module @@ -53,7 +54,8 @@ sha1sums=('7eadcc2ead4caa3fe960cc9663d67b96d43caa61' \ '08199d8e7906cb793277b798805d38ce386460d8' \ '28fb53322691d32a82de87e63672229ea5b7159e' \ '80ba54b1e13f0e8f53a84ca3f25df617fb53ae4c' \ - '4cd9c9ca67626d184136d95d82c28556e5e3e55e') + '4cd9c9ca67626d184136d95d82c28556e5e3e55e' \ + 'dda05326923336fcd60c11a6decb48cafd789bbe') subpkgs=("$pkgname-modules") subdescs=('Kernel modules for VirtualBox') @@ -104,6 +106,7 @@ build() { fi VboxSrcDir=${_F_cd_path}/out/linux.amd64/${VBoxBuildType}/bin + pwd Fpatchall # Configure and load our options diff --git a/source/xapps-extra/virtualbox/kernel-4.15.patch b/source/xapps-extra/virtualbox/kernel-4.15.patch new file mode 100644 index 0000000..795c400 --- /dev/null +++ b/source/xapps-extra/virtualbox/kernel-4.15.patch @@ -0,0 +1,87 @@ +--- VirtualBox-5.2.6/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2018-01-15 15:49:51.000000000 +0100 ++++ VirtualBox-5.2.6.new/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c 2018-01-30 11:39:53.995610589 +0100 +@@ -39,6 +39,12 @@ + # define VBOXGUEST_WITH_INPUT_DRIVER + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++# define CONST_4_15 const ++#else ++# define CONST_4_15 ++#endif ++ + #include "VBoxGuestInternal.h" + #ifdef VBOXGUEST_WITH_INPUT_DRIVER + # include <linux/input.h> +@@ -1058,7 +1064,7 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) + + /** log and dbg_log parameter setter. */ +-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam) ++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam) + { + if (g_fLoggerCreated) + { +@@ -1073,7 +1079,7 @@ + } + + /** log and dbg_log parameter getter. */ +-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam) ++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam) + { + PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); + *pszBuf = '\0'; +@@ -1084,7 +1090,7 @@ + + + /** log and dbg_log_flags parameter setter. */ +-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam) ++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam) + { + if (g_fLoggerCreated) + { +@@ -1098,7 +1104,7 @@ + } + + /** log and dbg_log_flags parameter getter. */ +-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam) ++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam) + { + PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); + *pszBuf = '\0'; +@@ -1109,7 +1115,7 @@ + + + /** log and dbg_log_dest parameter setter. */ +-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam) ++static int vgdrvLinuxParamLogDstSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam) + { + if (g_fLoggerCreated) + { +@@ -1123,7 +1129,7 @@ + } + + /** log and dbg_log_dest parameter getter. */ +-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam) ++static int vgdrvLinuxParamLogDstGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam) + { + PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); + *pszBuf = '\0'; +@@ -1134,7 +1140,7 @@ + + + /** r3_log_to_host parameter setter. */ +-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam) ++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, CONST_4_15 struct kernel_param *pParam) + { + if ( pszValue == NULL + || *pszValue == '\0' +@@ -1152,7 +1158,7 @@ + } + + /** r3_log_to_host parameter getter. */ +-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam) ++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, CONST_4_15 struct kernel_param *pParam) + { + strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled"); + return strlen(pszBuf); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
