1
0
forked from jengelh/virtualbox

Accepting request 655353 from home:frispete:kernel

Now it builds for 42.3 as well

- replace switch_to_python3.6.patch with switch_to_python3.4+.patch

- remove fixes_for_leap15.patch, upstream has incorporated it
- add conflict with i4l-vbox due to shared /etc/vbox
- adjust /etc/vbox permissions
- add /etc/vbox/autostart.cfg 
- fix vboxdrv.sh: apply new autostart mechanics to stop_vms()
- remove obsolete shutdown section in /etc/default/virtualbox
- add VBOXAUTOSTART_{DB,CONFIG} to /etc/default/virtualbox
- supply README.autostart

OBS-URL: https://build.opensuse.org/request/show/655353
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=459
This commit is contained in:
Larry Finger
2019-01-03 03:21:14 +00:00
committed by Git OBS Bridge
parent 19f1afc1f5
commit 35fb819fbd
7 changed files with 136 additions and 148 deletions

View File

@@ -68,6 +68,7 @@ Source16: vboxconfig.sh
Source17: vboxguestconfig.sh
Source18: fix_usb_rules.sh
Source19: vboxdrv.sh
Source20: README.autostart
Source98: %{name}-rpmlintrc
Source99: %{name}-patch-source.sh
#rework init scripts to fit suse needs
@@ -117,16 +118,14 @@ Patch115: vbox_fix_for_gcc7.patch
Patch116: Fix_for_server_1.19.patch
# Fix invalid use of internal headers
Patch118: internal-headers.patch
# Fix kernel API change in Leap 15
Patch119: fixes_for_leap15.patch
# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
Patch120: fixes_for_python.patch
# Remove vboxvideo from build
Patch121: remove_vbox_video_build.patch
# Fix build for Qt 5.11
Patch122: fixes_for_Qt5.11.patch
# Switch to Python 3.6
Patch123: switch_to_python3.6.patch
# Switch to Python 3.4+
Patch123: switch_to_python3.4+.patch
Patch124: fix_32_bit_builds.patch
# Fix API changes for kernel 4.20+
Patch125: fixes_for_4.20.patch
@@ -229,6 +228,10 @@ BuildRequires: xorg-x11-libXmu-devel-32bit
BuildRequires: xorg-x11-libXt-devel-32bit
%endif
%{?systemd_requires}
# package i4l-vbox from source package i4l-base shares the directory /etc/vbox
# with us, but with different owner.
Conflicts: i4l-vbox
%posttrans
%description
@@ -427,9 +430,6 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%patch115 -p1
%patch116 -p1
%patch118 -p1
%if 0%{suse_version} == 1500
%patch119 -p1
%endif
%patch120 -p1
%patch121 -p1
%patch122 -p1
@@ -442,6 +442,8 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
cp %{SOURCE1} UserManual.pdf
#copy kbuild config
cp %{SOURCE10} LocalConfig.kmk
#copy autostart doc
cp %{SOURCE20} README.autostart
#
##########################
####workaround kmk_sed --v
@@ -690,6 +692,7 @@ install -m 644 %{SOURCE9} %{buildroot}%{_bindir}/VirtualBox
# Service files to load kernel modules on boot
install -m 0644 %{SOURCE14} %{buildroot}%{_unitdir}/vboxdrv.service
ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcvboxdrv
install -m 0644 %{SOURCE15} %{buildroot}%{_unitdir}/vboxadd-service.service
install -m 0755 %{SOURCE16} %{buildroot}/sbin/vboxconfig
install -m 0755 %{SOURCE17} %{buildroot}/sbin/vboxguestconfig
@@ -703,6 +706,14 @@ ln -sf %{_unitdir}/vboxadd-service.service %{buildroot}%{_unitdir}/multi-user.ta
# config file for vboxdrv script and vboxweb
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
echo -e "#settings for vboxwebsrn\nVBOXWEB_USER=root" > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg
cat > %{buildroot}%{_sysconfdir}/vbox/autostart.cfg << EOF
default_policy = deny
# Create an entry for each user allowed to use autostart
myusername = {
allow = true
}
EOF
# install udev helper script for creating usb devices
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh %{buildroot}%{_vbox_instdir}/VBoxCreateUSBNode.sh
######################################################
@@ -859,7 +870,7 @@ export DISABLE_RESTART_ON_UPDATE=yes
%files
%defattr(-, root, root)
%doc UserManual.pdf
%doc README.autostart UserManual.pdf
%{_bindir}/VBoxManage
%{_bindir}/VBoxHeadless
%{_bindir}/VBoxTunctl
@@ -916,9 +927,11 @@ export DISABLE_RESTART_ON_UPDATE=yes
/usr/lib/virtualbox/vboxdrv.sh
%{_unitdir}/vboxdrv.service
%{_unitdir}/multi-user.target.wants/vboxdrv.service
%{_sbindir}/rcvboxdrv
%dir %{_sysconfdir}/vbox
##%attr(1775,root,vboxusers) %{_sysconfdir}/vbox
%attr(1775,root,vboxusers) %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/vbox/autostart.cfg
/sbin/vboxconfig
%{_vbox_instdir}/VBoxCreateUSBNode.sh
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT