Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=a8835bebf7992792c1a5fe218fd851bd0560abc6
commit a8835bebf7992792c1a5fe218fd851bd0560abc6 Author: DeX77 <de...@frugalware.org> Date: Mon Nov 13 12:11:02 2017 +0100 virtualbox-5.2.0-8-x86_64 * rebuild with fixes for kernel 4.14 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index b2d2e84..4b1dd3a 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -13,7 +13,7 @@ pkgname=virtualbox realname=VirtualBox pkgver=5.2.0 pkgextra= -pkgrel=7 +pkgrel=8 pkgdesc="Oracle VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org"; depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'libidl' 'sdl' \ @@ -32,6 +32,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver 60-vboxguest.rules \ vboxservice.service \ virtualbox-guest-utils.conf \ + fixes_for_4.14.patch \ depmod.patch) _F_kernelmod_scriptlet="$startdir/$pkgname.install" @@ -49,10 +50,11 @@ options=('scriptlet' 'nostrip' 'genscriptlet') ## we strip manually in build() _F_cd_path="${realname}-${pkgver}" sha1sums=('875704b2bbea3eb8161b7277b10df3dea5a748e2' \ 'aa931ae19edd8585150738f0efd8fedf5175a6d3' \ - '5e66ffd4607dafd9b55dc2b6e7591ef6892d4d49' \ + '1ecb406b349e519be28a16353682d3cd5dad175a' \ '08199d8e7906cb793277b798805d38ce386460d8' \ '28fb53322691d32a82de87e63672229ea5b7159e' \ '80ba54b1e13f0e8f53a84ca3f25df617fb53ae4c' \ + '2b3c5c1bd60e2d98a6406a5b9e87d6de883f77e4' \ '4cd9c9ca67626d184136d95d82c28556e5e3e55e') subpkgs=("$pkgname-modules") @@ -76,6 +78,9 @@ build() { Fcd + # Remove vboxvideo + Fexec rm -rf src/VBox/Additions/x11/vboxvideo || Fdie + ## FIXME: figure these Fsed '/usr/X11R6/bin/xterm' '/usr/bin/xterm' \ src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp @@ -196,6 +201,7 @@ build() { # host kernel modules Fexec cd $Fsrcdir/${_F_cd_path}/out/linux.amd64/release/bin/src || Fdie + Fmkdir ${_F_kernelmod_dir}/kernel/misc Fexec make V=1 KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} INSTALL_MOD_DIR=kernel/misc KERN_VER=${_F_kernelmod_uname} || Fdie @@ -245,14 +251,12 @@ build() { # guest kernel modules Fexec cd $Fsrcdir/${_F_cd_path}/out/linux.amd64/release/bin/additions/src || Fdie + Fexec rm -rf vboxvideo || Fdie Fmkdir ${_F_kernelmod_dir}/kernel/misc Fexec make V=1 KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} INSTALL_MOD_DIR=kernel/misc KERN_VER=${_F_kernelmod_uname} || Fdie Fexec make V=1 KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} INSTALL_MOD_DIR=kernel/misc KERN_VER=${_F_kernelmod_uname} INSTALL_MOD_PATH=${Fdestdir} install || Fdie - ## remove video one is in staging now - Frm ${_F_kernelmod_dir}/kernel/misc/vboxvideo* - #cleanup first ?!?!?! -- what for is that ? -- crazy Fexec rm -rf fw_tmp || Fdie Fexec mkdir fw_tmp || Fdie diff --git a/source/xapps-extra/virtualbox/LocalConfig.kmk b/source/xapps-extra/virtualbox/LocalConfig.kmk index 126cd80..b719320 100644 --- a/source/xapps-extra/virtualbox/LocalConfig.kmk +++ b/source/xapps-extra/virtualbox/LocalConfig.kmk @@ -17,3 +17,9 @@ VBOX_WITH_JWS := VBOX_WITH_JAVA_SUPPORT_IN_XPIDL := VBOX_WITH_WEBSERVICES := VBOX_WITH_WEBSERVICES_SSL := + +# no legacy X.org - use KMS +VBOX_USE_SYSTEM_XORG_HEADERS = 1 +VBOX_NO_LEGACY_XORG_X11 = 1 + +VBOX_USE_SYSTEM_GL_HEADERS = 1 \ No newline at end of file diff --git a/source/xapps-extra/virtualbox/fixes_for_4.14.patch b/source/xapps-extra/virtualbox/fixes_for_4.14.patch new file mode 100644 index 0000000..2eb47a9 --- /dev/null +++ b/source/xapps-extra/virtualbox/fixes_for_4.14.patch @@ -0,0 +1,46 @@ +--- VirtualBox-5.2.0/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2017-10-18 09:12:45.000000000 +0200 ++++ VirtualBox-5.2.0.new/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c 2017-11-13 11:39:13.752215042 +0100 +@@ -139,6 +139,10 @@ + # define bstats stats + # define qstats stats + # endif ++#endif ++ ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++#define SKB_GSO_UDP 0 + #endif + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) +@@ -737,9 +741,11 @@ + case PDMNETWORKGSOTYPE_IPV4_TCP: + fGsoType = SKB_GSO_TCPV4; + break; ++# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + case PDMNETWORKGSOTYPE_IPV4_UDP: + fGsoType = SKB_GSO_UDP; + break; ++#endif + case PDMNETWORKGSOTYPE_IPV6_TCP: + fGsoType = SKB_GSO_TCPV6; + break; +diff -Naur VirtualBox-5.2.0/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c VirtualBox-5.2.0.new/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c +--- VirtualBox-5.2.0/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c 2017-10-18 09:12:46.000000000 +0200 ++++ VirtualBox-5.2.0.new/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c 2017-11-13 11:39:13.501215050 +0100 +@@ -353,12 +353,17 @@ + static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size) + { + int ret; ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++ ++ ret = kernel_write(file, data, size, &offset); ++#else + mm_segment_t fs_save; + + fs_save = get_fs(); + set_fs(get_ds()); + ret = vfs_write(file, data, size, &offset); + set_fs(fs_save); ++#endif + if (ret < 0) + printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret); + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
