e5c24abf3b
Upstream changes without issue IDs: * User interface: various improvements for high resolution screens * User interface: added functionality to duplicate optical and floppy images * User interface: various improvements for the virtual media manager * VMM: fixed emulation so that Plan 9 guests can start once more (5.1.0 regression) * Storage: fixed regression breaking iSCSI * Audio: added HDA support for more exotic guests (e.g. Haiku) * Serial: fixed hanging I/O when using named pipes on Windows (5.2.0 regression) * Serial: fixed broken communication with certain devices on Linux hosts * USB/OHCI: improved behavior so that the controller state after a VM reset is closer to the initial state after VM start * EFI: fixed HFS+ driver which in rare cases failed to access most files on a volume * Shared clipboard: fixed hang with OS X host and Linux guest * Linux hosts: fixed kernel module compilation and start failures with Linux kernel 4.14 * X11 hosts: better handle WM_CLASS setting * Linux guests: fixed kernel module compilation and other problems with Linux kernel 4.14 * Linux guests: fixed various 5.2.0 regressions * Bridged networking: fixed duplicate EtherType in VLAN/priority tags on Linux (5.2.0 regression) The full changelog including issue IDs can be found at: https://www.virtualbox.org/wiki/Changelog Aside from just bumping the version number I also had to strip 3 levels of the paths included in the guest-additions patches, because the version was hardcoded in there and the patches still apply as-is. I've re-added the stripped path using patchFlags and the -d option of the patch utility. Tested this by running all of the tests in the "virtualbox" NixOS VM test module, here is the URL to the finished evaluation on my Hydra: https://headcounter.org/hydra/eval/380191 Signed-off-by: aszlig <aszlig@nix.build> Cc: @NeQuissimus, @orivej, @etu, @vcunat Issue: https://github.com/NixOS/nixpkgs/issues/31640 Issue: https://github.com/NixOS/nixpkgs/pull/31037
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
diff --git a/vboxsf/Makefile.include.header b/vboxsf/Makefile.include.header
|
|
index 8df1eb4d25..5a3e5604e7 100644
|
|
--- a/vboxsf/Makefile.include.header
|
|
+++ b/vboxsf/Makefile.include.header
|
|
@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
|
|
endif # neq($(KERNELRELEASE),)
|
|
|
|
# Kernel build folder
|
|
-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> and run Make again)
|
|
|
|
diff --git a/vboxguest/Makefile.include.header b/vboxguest/Makefile.include.header
|
|
index 8df1eb4d25..5a3e5604e7 100644
|
|
--- a/vboxguest/Makefile.include.header
|
|
+++ b/vboxguest/Makefile.include.header
|
|
@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
|
|
endif # neq($(KERNELRELEASE),)
|
|
|
|
# Kernel build folder
|
|
-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> and run Make again)
|
|
|
|
diff --git a/vboxvideo/Makefile.include.header b/vboxvideo/Makefile.include.header
|
|
index 8df1eb4d25..5a3e5604e7 100644
|
|
--- a/vboxvideo/Makefile.include.header
|
|
+++ b/vboxvideo/Makefile.include.header
|
|
@@ -117,7 +117,6 @@ else # neq($(KERNELRELEASE),)
|
|
endif # neq($(KERNELRELEASE),)
|
|
|
|
# Kernel build folder
|
|
-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> and run Make again)
|