git.iko.soy/typeable/nixpkgs
on master help sign in
fixup! virtualbox: 6.0.12 -> 6.0.14

use fetchpatch in guest additions

commit837dbc809ecfe076e153a1e19b475ace6406b5df authorFabian Möller <fabianm88@gmail.com> dateThu 12 Dec 2019, 00:59 (7 years ago) parent63969f5
2 files changed+58−156
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix+58−15 pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.4-fix.patch−141
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix+58−15
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
2−, zlib, xorg, dbus, virtualbox, dos2unix }:
2+, zlib, xorg, dbus, virtualbox, dos2unix, fetchpatch, findutils, patchutils }:
33
44let
55 version = virtualbox.version;
@@ -21,7 +21,7 @@ let
2121 { name = "libXfixes.so"; pkg = xorg.libXfixes; }
2222 ];
2323
24−in stdenv.mkDerivation {
24+in stdenv.mkDerivation rec {
2525 name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
2626
2727 src = fetchurl {
@@ -43,24 +43,67 @@ in stdenv.mkDerivation {
4343 prePatch = ''
4444 substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \
4545 --replace "<ttm/" "<drm/ttm/"
46− ${dos2unix}/bin/dos2unix ${
47− toString (map (f: "src/vboxguest-${version}/${f}") [
48− "vboxguest/include/iprt/cdefs.h"
49− "vboxguest/r0drv/linux/alloc-r0drv-linux.c"
50− "vboxguest/r0drv/linux/the-linux-kernel.h"
51− "vboxguest/r0drv/linux/thread2-r0drv-linux.c"
52− "vboxsf/include/iprt/cdefs.h"
53− "vboxsf/r0drv/linux/the-linux-kernel.h"
54− "vboxvideo/vbox_drv.c"
55− "vboxvideo/vbox_main.c"
56− ])
57− }
46+
47+ echo ${lib.escapeShellArgs patches} | \
48+ ${findutils}/bin/xargs -n1 ${patchutils}/bin/lsdiff --strip=1 --addprefix=src/vboxguest-${version}/ | \
49+ ${findutils}/bin/xargs ${dos2unix}/bin/dos2unix
5850 '';
5951
6052 patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ];
6153 # Kernel 5.4 fix, should be fixed with next upstream release
6254 # https://www.virtualbox.org/ticket/18945
63− patches = [ ./kernel-5.4-fix.patch ];
55+ patches = lib.concatLists (lib.mapAttrsToList (changeset: args:
56+ map (arg:
57+ fetchpatch ({
58+ name = "kernel-5.4-fix-${changeset}.patch";
59+ url = "https://www.virtualbox.org/changeset/${changeset}/vbox?format=diff";
60+ } // arg)) args) {
61+ "81586" = [{
62+ sha256 = "126z67x6vy65w6jlqbh4z4f1cffxnycwb69vns0154bawbsbxsiw";
63+ stripLen = 5;
64+ extraPrefix = "vboxguest/";
65+ }];
66+ "81587" = [
67+ {
68+ sha256 = "0simzswnl0wvnc2i9gixz99rfc7lxk1nrnskksrlrrl9hqnh0lva";
69+ stripLen = 5;
70+ extraPrefix = "vboxsf/";
71+ includes = [ "*/the-linux-kernel.h" ];
72+ }
73+ {
74+ sha256 = "0a8r9h3x3lcjq2fykgqhdaykp00rnnkbxz8xnxg847zgvca15y02";
75+ stripLen = 5;
76+ extraPrefix = "vboxguest/";
77+ includes = [ "*/the-linux-kernel.h" ];
78+ }
79+ ];
80+ "81649" = [
81+ {
82+ sha256 = "1p1skxlvqigydxr4sk7w51lpk7nxg0d9lppq39sdnfmgi1z0h0sc";
83+ stripLen = 2;
84+ extraPrefix = "vboxguest/";
85+ includes = [ "*/cdefs.h" ];
86+ }
87+ {
88+ sha256 = "1j060ggdnndyjdhkfvs15306gl7g932sim9xjmx2mnx8gjdmg37f";
89+ stripLen = 2;
90+ extraPrefix = "vboxsf/";
91+ includes = [ "*/cdefs.h" ];
92+ }
93+ {
94+ sha256 = "060h3a5k2yklbvlg0hyg4x87xrg37cvv3rjb67xizlwvlyy6ykkg";
95+ stripLen = 5;
96+ extraPrefix = "vboxguest/";
97+ includes = [ "*/thread2-r0drv-linux.c" ];
98+ }
99+ {
100+ sha256 = "0cxlkf7cy751gl8dgzr7vkims1kmx5pgzsrxyk8w18zyp5nk9glw";
101+ stripLen = 7;
102+ extraPrefix = "vboxvideo/";
103+ includes = [ "*/vbox_*.c" ];
104+ }
105+ ];
106+ });
64107
65108 unpackPhase = ''
66109 ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.4-fix.patchdeleted−141
@@ -1,141 +0,0 @@
1−diff --git a/vboxguest/include/iprt/cdefs.h b/vboxguest/include/iprt/cdefs.h
2−index 8aa1736..d5c5a4c 100644
3−--- a/vboxguest/include/iprt/cdefs.h
4−+++ b/vboxguest/include/iprt/cdefs.h
5−@@ -1166,7 +1166,7 @@
6− * Tell the compiler that we're falling through to the next case in a switch.
7− * @sa RT_FALL_THRU */
8− #if RT_GNUC_PREREQ(7, 0)
9−-# define RT_FALL_THROUGH() __attribute__((fallthrough))
10−+# define RT_FALL_THROUGH() __attribute__((__fallthrough__))
11− #else
12− # define RT_FALL_THROUGH() (void)0
13− #endif
14−diff --git a/vboxguest/r0drv/linux/alloc-r0drv-linux.c b/vboxguest/r0drv/linux/alloc-r0drv-linux.c
15−index 42e4ef5..acb0ac7 100644
16−--- a/vboxguest/r0drv/linux/alloc-r0drv-linux.c
17−+++ b/vboxguest/r0drv/linux/alloc-r0drv-linux.c
18−@@ -443,9 +443,6 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_t cb)
19− }
20−
21− SetPageReserved(&paPages[iPage]);
22−-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
23−- MY_SET_PAGES_EXEC(&paPages[iPage], 1);
24−-#endif
25− }
26− *pPhys = page_to_phys(paPages);
27− pvRet = phys_to_virt(page_to_phys(paPages));
28−@@ -491,9 +488,6 @@ RTR0DECL(void) RTMemContFree(void *pv, size_t cb)
29− for (iPage = 0; iPage < cPages; iPage++)
30− {
31− ClearPageReserved(&paPages[iPage]);
32−-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
33−- MY_SET_PAGES_NOEXEC(&paPages[iPage], 1);
34−-#endif
35− }
36− __free_pages(paPages, cOrder);
37− IPRT_LINUX_RESTORE_EFL_AC();
38−diff --git a/vboxguest/r0drv/linux/the-linux-kernel.h b/vboxguest/r0drv/linux/the-linux-kernel.h
39−index 8fda072..7904327 100644
40−--- a/vboxguest/r0drv/linux/the-linux-kernel.h
41−+++ b/vboxguest/r0drv/linux/the-linux-kernel.h
42−@@ -337,8 +337,10 @@ DECLINLINE(unsigned long) msecs_to_jiffies(unsigned int cMillies)
43− #endif
44−
45− #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
46−-# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
47−-# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
48−+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */
49−+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
50−+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
51−+# endif
52− #else
53− # define MY_SET_PAGES_EXEC(pPages, cPages) \
54− do { \
55−diff --git a/vboxguest/r0drv/linux/thread2-r0drv-linux.c b/vboxguest/r0drv/linux/thread2-r0drv-linux.c
56−index 7c82b38..04479b5 100644
57−--- a/vboxguest/r0drv/linux/thread2-r0drv-linux.c
58−+++ b/vboxguest/r0drv/linux/thread2-r0drv-linux.c
59−@@ -36,6 +36,9 @@
60− #include <iprt/errcore.h>
61− #include "internal/thread.h"
62−
63−+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
64−+ #include <uapi/linux/sched/types.h>
65−+#endif /* >= KERNEL_VERSION(4, 11, 0) */
66−
67− RTDECL(RTTHREAD) RTThreadSelf(void)
68− {
69−diff --git a/vboxsf/include/iprt/cdefs.h b/vboxsf/include/iprt/cdefs.h
70−index 8aa1736..d5c5a4c 100644
71−--- a/vboxsf/include/iprt/cdefs.h
72−+++ b/vboxsf/include/iprt/cdefs.h
73−@@ -1166,7 +1166,7 @@
74− * Tell the compiler that we're falling through to the next case in a switch.
75− * @sa RT_FALL_THRU */
76− #if RT_GNUC_PREREQ(7, 0)
77−-# define RT_FALL_THROUGH() __attribute__((fallthrough))
78−+# define RT_FALL_THROUGH() __attribute__((__fallthrough__))
79− #else
80− # define RT_FALL_THROUGH() (void)0
81− #endif
82−diff --git a/vboxsf/r0drv/linux/the-linux-kernel.h b/vboxsf/r0drv/linux/the-linux-kernel.h
83−index 8fda072..7904327 100644
84−--- a/vboxsf/r0drv/linux/the-linux-kernel.h
85−+++ b/vboxsf/r0drv/linux/the-linux-kernel.h
86−@@ -337,8 +337,10 @@ DECLINLINE(unsigned long) msecs_to_jiffies(unsigned int cMillies)
87− #endif
88−
89− #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
90−-# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
91−-# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
92−+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */
93−+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages)
94−+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages)
95−+# endif
96− #else
97− # define MY_SET_PAGES_EXEC(pPages, cPages) \
98− do { \
99−diff --git a/vboxvideo/vbox_drv.c b/vboxvideo/vbox_drv.c
100−index 8e4f337..9454301 100644
101−--- a/vboxvideo/vbox_drv.c
102−+++ b/vboxvideo/vbox_drv.c
103−@@ -265,12 +265,16 @@ static void vbox_master_drop(struct drm_device *dev, struct drm_file *file_priv)
104− }
105−
106− static struct drm_driver driver = {
107−+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
108− .driver_features =
109− DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
110−-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81)
111−+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81)
112− DRIVER_IRQ_SHARED |
113−-#endif
114−+# endif /* < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81) */
115− DRIVER_PRIME,
116−+#else /* >= KERNEL_VERSION(5, 4, 0) */
117−+ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
118−+#endif /* < KERNEL_VERSION(5, 4, 0) */
119− .dev_priv_size = 0,
120−
121− .load = vbox_driver_load,
122−diff --git a/vboxvideo/vbox_main.c b/vboxvideo/vbox_main.c
123−index 11b9745..cc7831d 100644
124−--- a/vboxvideo/vbox_main.c
125−+++ b/vboxvideo/vbox_main.c
126−@@ -612,11 +612,13 @@ void vbox_gem_free_object(struct drm_gem_object *obj)
127−
128− static inline u64 vbox_bo_mmap_offset(struct vbox_bo *bo)
129− {
130−-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70)
131−+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
132−+ return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
133−+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70)
134− return bo->bo.addr_space_offset;
135− #else
136− return drm_vma_node_offset_addr(&bo->bo.vma_node);
137−-#endif
138−+#endif /* >= KERNEL_VERSION(5, 4, 0) */
139− }
140−
141− int