Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2019-12-23 22:39:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox" Mon Dec 23 22:39:38 2019 rev:188 rq:758050 version:6.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2019-12-11 12:00:49.340848949 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new.6675/virtualbox.changes 2019-12-23 22:42:28.381951218 +0100 @@ -1,0 +2,5 @@ +Wed Dec 18 19:47:16 UTC 2019 - Larry Finger <[email protected]> + +- Fix build for kernel 5.5. Added file "fixes_for_5.5.patch". + +------------------------------------------------------------------- New: ---- fixes_for_5.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.4k5gNi/_old 2019-12-23 22:42:30.377952083 +0100 +++ /var/tmp/diff_new_pack.4k5gNi/_new 2019-12-23 22:42:30.381952085 +0100 @@ -152,6 +152,8 @@ #endif # Fixes for API changes in kernel 5.4 Patch133: fixes_for_5.4.patch +# Fixes for API changes in kernel 5.5 +Patch134: fixes_for_5.5.patch Patch999: virtualbox-fix-ui-background-color.patch # BuildRequires: %{python_module devel} @@ -458,6 +460,7 @@ %patch132 -p1 %endif %patch133 -p1 +%patch134 -p1 # make VB UI background colors look sane again %patch999 -p1 @@ -546,11 +549,7 @@ echo "build kernel modules" #%if 0%{?suse_version} < 1550 for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ - out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do -#%else -#for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ -# out/linux.*/release/bin/additions/src/vbox{guest,sf}; do -#%endif + out/linux.*/release/bin/additions/src/vbox{guest,sf}; do #get the module name from path module_name=$(basename "$vbox_module") @@ -559,6 +558,10 @@ # delete old build dir for sure rm -rf modules_build_dir/${module_name}_${flavor} + if [ "$module_name" = "vboxdrv" -o \ + "$module_name" = "vboxguest" ] ; then + SYMBOLS="" + fi # create build directory for specific flavor mkdir -p modules_build_dir/$flavor @@ -571,16 +574,18 @@ "$module_name" = "vboxpci" ] ; then cp $PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers \ $PWD/modules_build_dir/$flavor/$module_name + SYMBOLS="$PWD/modules_build_dir/$flavor/vboxdrv/Module.symvers" fi - # copy vboxguest (for guest) module symbols which are used by vboxsf and vboxvideo km's: + # copy vboxguest (for guest) module symbols which are used by vboxsf km: if [ "$module_name" = "vboxsf" -o \ "$module_name" = "vboxvideo" ] ; then cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ $PWD/modules_build_dir/$flavor/$module_name + SYMBOLS="$PWD/modules_build_dir/$flavor/vboxguest/Module.symvers" fi # build the module for the specific flavor make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor %{?linux_make_arch} modules \ - M=$PWD/modules_build_dir/$flavor/$module_name V=1 + M=$PWD/modules_build_dir/$flavor/$module_name KBUILD_EXTRA_SYMBOLS="$SYMBOLS" V=1 done done ++++++ fixes_for_5.4.patch ++++++ --- /var/tmp/diff_new_pack.4k5gNi/_old 2019-12-23 22:42:30.461952120 +0100 +++ /var/tmp/diff_new_pack.4k5gNi/_new 2019-12-23 22:42:30.461952120 +0100 @@ -6,7 +6,7 @@ #define VBOXNETFLT_OS_SPECFIC 1 #include "../VBoxNetFltInternal.h" -+# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2 ++# if defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2 +# define OPENSUSE_152 +# endif + ++++++ fixes_for_5.5.patch ++++++ Index: VirtualBox-6.0.14/src/VBox/HostDrivers/linux/Makefile =================================================================== --- VirtualBox-6.0.14.orig/src/VBox/HostDrivers/linux/Makefile +++ VirtualBox-6.0.14/src/VBox/HostDrivers/linux/Makefile @@ -45,6 +45,8 @@ else # ! KERNELRELEASE KBUILD_VERBOSE ?= KERN_VER ?= $(shell uname -r) +PWD ?= $(shell pwd) + .PHONY: all install clean check unload load vboxdrv vboxnetflt vboxnetadp \ vboxpci @@ -64,6 +66,7 @@ vboxnetflt: vboxdrv if [ -f vboxdrv/Module.symvers ]; then \ cp vboxdrv/Module.symvers vboxnetflt; \ fi; \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetflt/Module.symvers; \ echo "=== Building 'vboxnetflt' module ==="; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt || exit 1; \ cp vboxnetflt/vboxnetflt.ko .; \ @@ -75,8 +78,9 @@ vboxnetadp: vboxdrv if [ -f vboxdrv/Module.symvers ]; then \ cp vboxdrv/Module.symvers vboxnetadp; \ fi; \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetadp/Module.symvers; \ echo "=== Building 'vboxnetadp' module ==="; \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp || exit 1; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp || exit 1; \ cp vboxnetadp/vboxnetadp.ko .; \ echo; \ fi @@ -86,6 +90,7 @@ vboxpci: vboxdrv if [ -f vboxdrv/Module.symvers ]; then \ cp vboxdrv/Module.symvers vboxpci; \ fi; \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxpci/Module.symvers; \ echo "=== Building 'vboxpci' module ==="; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci || exit 1; \ cp vboxpci/vboxpci.ko .; \ @@ -95,12 +100,15 @@ vboxpci: vboxdrv install: @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install @if [ -d vboxnetflt ]; then \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetflt/Module.symvers; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \ fi @if [ -d vboxnetadp ]; then \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxnetadp/Module.symvers; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \ fi @if [ -d vboxpci ]; then \ + export KBUILD_EXTRA_SYMBOLS=${PWD}/vboxpci/Module.symvers; \ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \ fi ++++++ virtualbox-kmp-files ++++++ --- /var/tmp/diff_new_pack.4k5gNi/_old 2019-12-23 22:42:30.677952213 +0100 +++ /var/tmp/diff_new_pack.4k5gNi/_new 2019-12-23 22:42:30.681952215 +0100 @@ -6,5 +6,4 @@ /lib/modules/%2-%1/extra/vboxnetflt.ko /lib/modules/%2-%1/extra/vboxpci.ko /lib/modules/%2-%1/extra/vboxsf.ko -/lib/modules/%2-%1/extra/vboxvideo.ko /lib/modules/%2-%1/extra/vboxguest.ko
