new patch: don't override KERN_DIR if already defined

diff --git a/VirtualBox-kerndir.patch b/VirtualBox-kerndir.patch
new file mode 100644 (file)
index 0000000..2f6a345
--- /dev/null
+++ b/VirtualBox-kerndir.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-5.2.2/src/VBox/Installer/linux/Makefile.include.header.orig     2017-11-25 14:42:43.336204931 +0100
++++ VirtualBox-5.2.2/src/VBox/Installer/linux/Makefile.include.header  2017-11-25 14:43:00.666146939 +0100
+@@ -136,7 +136,7 @@
+ endif # neq($(KERNELRELEASE),)
+ 
+ # Kernel build folder
+-KERN_DIR := /lib/modules/$(KERN_VER)/build
++KERN_DIR ?= /lib/modules/$(KERN_VER)/build
+ ifneq ($(shell if test -d $(KERN_DIR); then echo yes; fi),yes)
+  $(error Error: unable to find the headers of the Linux kernel to build against. \
+           Specify KERN_VER=<version> (currently $(KERN_VER)) and run Make again)

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 0019e3f2b71af3496105272a4acaf911c3871f39..bd3e0ae2281cab4d7d81365f0f4cceeadeb85245 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -81,6 +81,7 @@ Patch13:      %{pname}-no-scrextend.patch
 Patch14:       %{pname}-multipython.patch
 Patch15:       %{pname}-lightdm-1.19.2.patch
 Patch16:       %{pname}-no-vboxvideo.patch
+Patch17:       %{pname}-kerndir.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -540,6 +541,7 @@ cd ../..\
 %patch14 -p0
 %patch15 -p0
 %patch16 -p0
+%patch17 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in