From: Jan Palus <atler@pld-linux.org>
Date: Tue, 24 Apr 2018 10:26:25 +0000 (+0200)
Subject: keep on building vboxguest until mainline module is feature complete
X-Git-Tag: auto/th/VirtualBox-5.2.10-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=commitdiff_plain;h=e93d1e500f9589f97e360a7dfa3339b0e5425390

keep on building vboxguest until mainline module is feature complete

- seems like vboxsf needs to be mainlined as well
- currently mainline vboxguest fails even at load time
---

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 40771b7..d13d1f1 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,7 +42,7 @@ exit 1
 
 %define		qtver	5.6.0
 
-%define		rel		1
+%define		rel		2
 %define		pname		VirtualBox
 Summary:	VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox - wirtualizator sprzętu x86
@@ -477,9 +477,7 @@ gospodarzem sprzętu PCI.\
 %files -n kernel%{_alt_kernel}-virtualbox-guest\
 %defattr(644,root,root,755)\
 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/virtualbox-guest.conf\
-%if %{_kernel_version_code} < %{_kernel_version_magic 4 16 0}\
 /lib/modules/%{_kernel_ver}/misc/vboxguest.ko*\
-%endif\
 /lib/modules/%{_kernel_ver}/misc/vboxsf.ko*\
 %if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
 /lib/modules/%{_kernel_ver}/misc/vboxvideo.ko*\
@@ -514,19 +512,15 @@ cd PLD-MODULE-BUILD/HostDrivers\
 %build_kernel_modules -m vboxnetflt -C vboxnetflt\
 %build_kernel_modules -m vboxpci -C vboxpci\
 cd ../GuestDrivers\
-%if %{_kernel_version_code} < %{_kernel_version_magic 4 16 0}\
 %build_kernel_modules -m vboxguest -C vboxguest\
 cp -a vboxguest/Module.symvers vboxsf\
-%endif\
 %build_kernel_modules -m vboxsf -C vboxsf -c\
 %if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
 %build_kernel_modules -m vboxvideo -C vboxvideo\
 %endif\
 cd ../..\
 %install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/HostDrivers/vboxdrv/vboxdrv,PLD-MODULE-BUILD/HostDrivers/vboxnetadp/vboxnetadp,PLD-MODULE-BUILD/HostDrivers/vboxnetflt/vboxnetflt,PLD-MODULE-BUILD/HostDrivers/vboxpci/vboxpci,PLD-MODULE-BUILD/GuestDrivers/vboxsf/vboxsf -d misc\
-%if %{_kernel_version_code} < %{_kernel_version_magic 4 16 0}\
 %install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxguest/vboxguest -d misc\
-%endif\
 %if %{_kernel_version_code} < %{_kernel_version_magic 4 13 0}\
 %install_kernel_modules -D PLD-MODULE-BUILD/installed -m PLD-MODULE-BUILD/GuestDrivers/vboxvideo/vboxvideo -d misc\
 %endif\