jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 572356 from Virtualization

Browse Source 
- Update "fixes_for_4.15.patch": remove useless log statement that
  broke building the vboxvideo guest kernel module
- Build and install it again, it's needed for KMS support, i.e. for
  Xorg's "modesetting" driver to work in the guest (boo#1079221) (forwarded request 572312 from wolfi323)

OBS-URL: https://build.opensuse.org/request/show/572356
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=155
This commit is contained in:
Dominique Leuenberger 2018-02-05 09:43:57 +00:00 committed by Git OBS Bridge
commit 9a786893e2
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fixes_for_4.15.patch
View File

@ -102,7 +102,7 @@ Index: VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c
=================================================================== ===================================================================
--- VirtualBox-5.2.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c --- VirtualBox-5.2.6.orig/src/VBox/Additions/linux/drm/vbox_mode.c
+++ VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c +++ VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c
@@ -401,8 +401,13 @@ static struct drm_encoder *vbox_best_sin @@ -401,7 +401,11 @@ static struct drm_encoder *vbox_best_sin
/* pick the encoder ids */ /* pick the encoder ids */
if (enc_id) if (enc_id)
@ -113,7 +113,5 @@ Index: VirtualBox-5.2.6/src/VBox/Additions/linux/drm/vbox_mode.c
+ return drm_encoder_find(connector->dev, enc_id); + return drm_encoder_find(connector->dev, enc_id);
+#endif +#endif
+ LogFunc(("vboxvideo: %d\n", __LINE__));
return NULL; return NULL;
} }

1
virtualbox-guest-kmp-files
View File

@ -1,5 +1,6 @@
%defattr (-,root,root) %defattr (-,root,root)
%dir /lib/modules/%2-%1/ %dir /lib/modules/%2-%1/
%dir /lib/modules/%2-%1/extra %dir /lib/modules/%2-%1/extra
/lib/modules/%2-%1/extra/vboxvideo.ko
/lib/modules/%2-%1/extra/vboxsf.ko /lib/modules/%2-%1/extra/vboxsf.ko
/lib/modules/%2-%1/extra/vboxguest.ko /lib/modules/%2-%1/extra/vboxguest.ko

8
virtualbox.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Feb 3 14:23:26 UTC 2018 - wbauer@tmo.at
- Update "fixes_for_4.15.patch": remove useless log statement that
broke building the vboxvideo guest kernel module
- Build and install it again, it's needed for KMS support, i.e. for
Xorg's "modesetting" driver to work in the guest (boo#1079221)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 18 19:01:59 UTC 2018 - Larry.Finger@lwfinger.net Thu Jan 18 19:01:59 UTC 2018 - Larry.Finger@lwfinger.net

14
virtualbox.spec
View File

@ -483,10 +483,10 @@ install -D -m 644 "COPYING" "%{buildroot}%{_datadir}/licenses/LICENSE.vnc"
# #
# build kernel modules for guest and host (check novel-kmp package as example) # build kernel modules for guest and host (check novel-kmp package as example)
# host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci # host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci
# guest modules : vboxguest,vboxsf # guest modules : vboxguest,vboxsf,vboxvideo
echo "build kernel modules" echo "build kernel modules"
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
out/linux.*/release/bin/additions/src/vbox{guest,sf}; do out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do
#get the module name from path #get the module name from path
module_name=$(basename "$vbox_module") module_name=$(basename "$vbox_module")
@ -514,10 +514,10 @@ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
$PWD/modules_build_dir/$flavor/$module_name $PWD/modules_build_dir/$flavor/$module_name
fi fi
# copy vboxguest (for guest) module symbols which are used by vboxvideo km: # copy vboxguest (for guest) module symbols which are used by vboxvideo km:
# if [ "$module_name" = "vboxvideo" ]; then if [ "$module_name" = "vboxvideo" ]; then
# cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \
# $PWD/modules_build_dir/$flavor/$module_name $PWD/modules_build_dir/$flavor/$module_name
# fi fi
# build the module for the specific flavor # build the module for the specific flavor
make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \ make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \
M=$PWD/modules_build_dir/$flavor/$module_name M=$PWD/modules_build_dir/$flavor/$module_name
@ -556,7 +556,7 @@ export INSTALL_MOD_DIR=extra
export INITRD_IN_POSTTRANS=1 export INITRD_IN_POSTTRANS=1
export KMP_NEEDS_MKINITRD=0 export KMP_NEEDS_MKINITRD=0
#to install modules we use here similar steps like in build phase, go through all the modules : #to install modules we use here similar steps like in build phase, go through all the modules :
for module_name in vbox{drv,netflt,pci,netadp,guest,sf} for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video}
do do
#and through the all flavors #and through the all flavors
for flavor in %{flavors_to_build}; do for flavor in %{flavors_to_build}; do