1:36 a.m.
commit 3407f6b08489f447b3847dc253d4896df78c4f93
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Oct 28 02:36:04 2016 +0100
Fixes for EL7 and X.org-1.19
VirtualBox-5.0.18-xserver_guest.patch | 9 ---------
VirtualBox-5.0.18-xserver_guest_xorg19.patch | 12 ++++++++++++
VirtualBox.spec | 21 ++++++++++++++++-----
vboxservice.service | 5 ++++-
4 files changed, 32 insertions(+), 15 deletions(-)
---
diff --git a/VirtualBox-5.0.18-xserver_guest.patch
b/VirtualBox-5.0.18-xserver_guest.patch
index 1a94a05..300f09a 100644
--- a/VirtualBox-5.0.18-xserver_guest.patch
+++ b/VirtualBox-5.0.18-xserver_guest.patch
@@ -106,15 +106,6 @@ xf86_ansic.h doesn't exist anymore.
VBoxGuestR3LibXOrg
--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182
+0100
+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100
-@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
-
- ifdef VBOX_USE_SYSTEM_XORG_HEADERS
- # Build using local X.Org headers. We assume X.Org Server 1.7 or later.
-- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
-+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
- SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
- vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_system_CFLAGS := \
@@ -384,7 +384,6 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
vboxvideo_drv_system_DEFS := $(filter-out _XORG_SERVER_H_ _DIX_CONFIG_H_,
$(vboxvideo_15_DEFS))
vboxvideo_drv_system_INCS += \
diff --git a/VirtualBox-5.0.18-xserver_guest_xorg19.patch
b/VirtualBox-5.0.18-xserver_guest_xorg19.patch
new file mode 100644
index 0000000..60b721a
--- /dev/null
+++ b/VirtualBox-5.0.18-xserver_guest_xorg19.patch
@@ -0,0 +1,12 @@
+Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
+--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-10-11 02:49:23.184986182
+0100
++++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2016-10-11 02:49:39.879176964 +0100
+@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+ # Build using local X.Org headers. We assume X.Org Server 1.7 or later.
+- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
++ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
+ SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
+ vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_system_CFLAGS := \
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 6c2654e..1bc6085 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -25,7 +25,7 @@
Name: VirtualBox
Version: 5.1.8
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -45,6 +45,7 @@ Patch2: VirtualBox-5.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-5.0.18-xserver_guest.patch
+Patch24: VirtualBox-5.0.18-xserver_guest_xorg19.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
Patch27: VirtualBox-gcc.patch
# from Debian
@@ -262,6 +263,9 @@ rm -r src/libs/zlib-1.2.8/
%patch22 -p1 -b .gsoap
%endif
%patch23 -p1 -b .xserver_guest
+%if 0%{?fedora}
+%patch24 -p1 -b .xserver_guest_xorg19
+%endif
%patch26 -p1 -b .nobundles
#patch27 -p1 -b .gcc
%if 0%{?fedora} > 20
@@ -467,8 +471,10 @@ install -p -m 0644 obj/bin/virtualbox.xml
%{buildroot}%{_datadir}/mime/packages
#
# [1] https://www.virtualbox.org/changeset/43588/vbox
-#install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
-# %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%if 0%{?rhel}
+install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
+ %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%endif
# Guest-additions tools
install -m 0755 -t %{buildroot}%{_sbindir} \
@@ -738,8 +744,10 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_sbindir}/VBoxService
%{_sbindir}/mount.vboxsf
%{_libdir}/security/pam_vbox.so
-# do not use xorg module drive
-#{_libdir}/xorg/modules/drivers/*
+%if 0%{?rhel}
+# do not use xorg module drive in newer versions
+%{_libdir}/xorg/modules/drivers/*
+%endif
%{_libdir}/VBox*.so
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
@@ -752,6 +760,9 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Oct 19 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.8-2
+- Fixes for EL7 and X.org-1.19
+
* Tue Oct 18 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.8-1
- Update VBox to 5.1.8
diff --git a/vboxservice.service b/vboxservice.service
index 41ad4d1..8caa696 100644
--- a/vboxservice.service
+++ b/vboxservice.service
@@ -1,6 +1,9 @@
[Unit]
Description=VirtualBox guest services
-ConditionVirtualization=oracle
+#RHEL7 says that Virtualization is kvm !?
+ConditionVirtualization=|kvm
+ConditionVirtualization=|oracle
+
[Service]
ExecStart=/usr/sbin/VBoxService -f