1
0
forked from pool/virtualbox

Accepting request 894688 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/894688
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=218
This commit is contained in:
Dominique Leuenberger 2021-05-23 21:30:24 +00:00 committed by Git OBS Bridge
commit 6be0f017e8
3 changed files with 49 additions and 5 deletions

View File

@ -6,5 +6,5 @@
/lib/modules/%2-%1/extra/vboxnetflt.ko /lib/modules/%2-%1/extra/vboxnetflt.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
/lib/modules/%2-%1/extra/vboxvideo.ko #/lib/modules/%2-%1/extra/vboxvideo.ko

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 17 15:59:52 UTC 2021 - Larry Finger <Larry.Finger@gmail.com>
- Disable the build of kmp vboxvideo, at least temporarily.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 14 10:35:52 UTC 2021 - Dan Čermák <dcermak@suse.com> Fri May 14 10:35:52 UTC 2021 - Dan Čermák <dcermak@suse.com>

View File

@ -1,5 +1,5 @@
# #
# spec file # spec file for package virtualbox%{?dash}%{?name_suffix}
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
@ -186,6 +186,8 @@ Patch137: handle_gsoap_208103.patch
# Fix for struct file_operations backport in 15.3 # Fix for struct file_operations backport in 15.3
Patch139: fixes_for_leap15.3.patch Patch139: fixes_for_leap15.3.patch
Patch141: vb-6.1.16-modal-dialog-parent.patch Patch141: vb-6.1.16-modal-dialog-parent.patch
# Fixes for kernel 5.13
# Patch142: fixes_for_5.13.patch
Patch999: virtualbox-fix-ui-background-color.patch Patch999: virtualbox-fix-ui-background-color.patch
# #
@ -326,6 +328,10 @@ the terms of the GNU Public License (GPL).
@ -365,6 +371,10 @@ This package contains the code for the GUI used to control VMs.
@ -398,6 +408,10 @@ The VirtualBox web server is used to control headless VMs using a browser.
@ -433,6 +447,10 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers
@ -473,6 +491,10 @@ VirtualBox guest addition tools.
@ -513,6 +535,10 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package.
@ -548,6 +574,10 @@ Development file for %{name}
@ -590,6 +620,10 @@ sudo /sbin/vboxguestconfig
########################################### ###########################################
%package guest-desktop-icons %package guest-desktop-icons
@ -618,6 +652,10 @@ This package contains icons for guest desktop files that were created on the des
@ -696,6 +734,7 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
%patch139 -p1 %patch139 -p1
%endif %endif
%patch141 -p1 %patch141 -p1
#%patch142 -p1
# make VB UI background colors look sane again # make VB UI background colors look sane again
%patch999 -p1 %patch999 -p1
@ -1367,10 +1406,10 @@ COMMON_KMK_FLAGS+="
# #
# 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 # host modules : vboxdrv,vboxnetflt,vboxnetadp
# guest modules : vboxguest,vboxsf vboxvideo # guest modules : vboxguest,vboxsf
echo "build kernel modules" echo "build kernel modules"
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp} \
out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do out/linux.*/release/bin/additions/src/vbox{guest,sf}; do
#get the module name from path #get the module name from path
module_name=$(basename "$vbox_module") module_name=$(basename "$vbox_module")
@ -1413,7 +1452,7 @@ done
export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=extra export INSTALL_MOD_DIR=extra
#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,netadp,guest,sf,video} for module_name in vbox{drv,netflt,netadp,guest,sf}
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