summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-03-02 00:42:08 +0000
committerArmin Kuster <akuster808@gmail.com>2018-03-16 19:15:49 -0700
commit6d2624125fb91e152e0de7c0c2b5141dee23c5c0 (patch)
tree9df7efaff19f1b12e0bfbd8a938460ec36f392cb /meta-oe
parent4cbe85add7eb086277125a7ad43cbdde5e4ac658 (diff)
downloadmeta-openembedded-6d2624125fb91e152e0de7c0c2b5141dee23c5c0.tar.gz
vboxguestdrivers: upgrade to 5.2.8
* 5.1.26 doesn't build with 4.15 kernel Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff90
-rw-r--r--meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb (renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb)7
2 files changed, 2 insertions, 95 deletions
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
deleted file mode 100644
index 23a9021f0..000000000
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
+++ /dev/null
@@ -1,90 +0,0 @@
1Based on:
2https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
3
4Upstream-Status: Pending (hopefully new vbox will be released soon with proper 4.15 support, this patch isn't backwards compatible)
5
6--- vbox_module.orig/vboxvideo/vbox_mode.c 2018-02-18 16:42:47.000000000 +0000
7+++ vbox_module/vboxvideo/vbox_mode.c 2018-02-18 16:55:14.466029313 +0000
8@@ -396,7 +396,7 @@
9
10 /* pick the encoder ids */
11 if (enc_id)
12- return drm_encoder_find(connector->dev, enc_id);
13+ return drm_encoder_find(connector->dev, NULL, enc_id);
14
15 return NULL;
16 }
17--- vbox_module.orig/vboxguest/VBoxGuest-linux.c 2018-02-18 16:42:28.000000000 +0000
18+++ vbox_module/vboxguest/VBoxGuest-linux.c 2018-02-18 16:54:36.793049118 +0000
19@@ -1058,7 +1058,7 @@
20 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
21
22 /** log and dbg_log parameter setter. */
23-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
24+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
25 {
26 if (g_fLoggerCreated)
27 {
28@@ -1073,7 +1073,7 @@
29 }
30
31 /** log and dbg_log parameter getter. */
32-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
33+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
34 {
35 PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
36 *pszBuf = '\0';
37@@ -1084,7 +1084,7 @@
38
39
40 /** log and dbg_log_flags parameter setter. */
41-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
42+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
43 {
44 if (g_fLoggerCreated)
45 {
46@@ -1098,7 +1098,7 @@
47 }
48
49 /** log and dbg_log_flags parameter getter. */
50-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
51+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
52 {
53 PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
54 *pszBuf = '\0';
55@@ -1109,7 +1109,7 @@
56
57
58 /** log and dbg_log_dest parameter setter. */
59-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
60+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
61 {
62 if (g_fLoggerCreated)
63 {
64@@ -1123,7 +1123,7 @@
65 }
66
67 /** log and dbg_log_dest parameter getter. */
68-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
69+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
70 {
71 PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
72 *pszBuf = '\0';
73@@ -1134,7 +1134,7 @@
74
75
76 /** r3_log_to_host parameter setter. */
77-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
78+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
79 {
80 if ( pszValue == NULL
81 || *pszValue == '\0'
82@@ -1152,7 +1152,7 @@
83 }
84
85 /** r3_log_to_host parameter getter. */
86-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
87+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
88 {
89 strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
90 return strlen(pszBuf);
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
index c018b789f..e00db4d7e 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
@@ -15,11 +15,8 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
15 file://Makefile.utils \ 15 file://Makefile.utils \
16" 16"
17 17
18# For default linux-yocto 4.15 18SRC_URI[md5sum] = "e731ea9c5c31096ec4c2a3bfba26665c"
19SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff" 19SRC_URI[sha256sum] = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"
20
21SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
22SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7"
23 20
24S = "${WORKDIR}/vbox_module" 21S = "${WORKDIR}/vbox_module"
25 22
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 17:22:47 +0000