diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-02-24 10:51:55 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-01 16:12:56 -0800 |
commit | 7b5d778f8bef90056c9b2c5cc08d05b40dcf8e59 (patch) | |
tree | c9cce58cac923956edeb59e3185a2071c20e7b69 /meta-oe | |
parent | 6d3da810947c5b4725f6a83e87fad9df2f2eee28 (diff) | |
download | meta-openembedded-7b5d778f8bef90056c9b2c5cc08d05b40dcf8e59.tar.gz |
vboxguestdrivers: upgrade to 5.2.6
* 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.diff | 90 | ||||
-rw-r--r-- | meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb (renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb) | 22 |
2 files changed, 107 insertions, 5 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 new file mode 100644 index 000000000..23a9021f0 --- /dev/null +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | |||
@@ -0,0 +1,90 @@ | |||
1 | Based on: | ||
2 | https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | ||
3 | |||
4 | Upstream-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.1.26.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb index fdefe0317..c018b789f 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb | |||
@@ -12,22 +12,27 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" | |||
12 | VBOX_NAME = "VirtualBox-${PV}" | 12 | VBOX_NAME = "VirtualBox-${PV}" |
13 | 13 | ||
14 | SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ | 14 | SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ |
15 | file://Makefile.utils \ | 15 | file://Makefile.utils \ |
16 | " | 16 | " |
17 | SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3" | 17 | |
18 | SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9" | 18 | # For default linux-yocto 4.15 |
19 | SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff" | ||
20 | |||
21 | SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8" | ||
22 | SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7" | ||
19 | 23 | ||
20 | S = "${WORKDIR}/vbox_module" | 24 | S = "${WORKDIR}/vbox_module" |
21 | 25 | ||
22 | export BUILD_TARGET_ARCH="${ARCH}" | 26 | export BUILD_TARGET_ARCH="${ARCH}" |
23 | export BUILD_TARGET_ARCH_x86-64="amd64" | 27 | export BUILD_TARGET_ARCH_x86-64="amd64" |
24 | export KERN_DIR="${STAGING_KERNEL_DIR}" | 28 | |
29 | EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'" | ||
25 | 30 | ||
26 | addtask export_sources before do_patch after do_unpack | 31 | addtask export_sources before do_patch after do_unpack |
27 | 32 | ||
28 | do_export_sources() { | 33 | do_export_sources() { |
29 | mkdir -p "${S}" | 34 | mkdir -p "${S}" |
30 | ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz | 35 | ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz |
31 | tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz | 36 | tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz |
32 | 37 | ||
33 | # add a mount utility to use shared folder from VBox Addition Source Code | 38 | # add a mount utility to use shared folder from VBox Addition Source Code |
@@ -38,6 +43,13 @@ do_export_sources() { | |||
38 | 43 | ||
39 | } | 44 | } |
40 | 45 | ||
46 | do_configure_prepend() { | ||
47 | # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. | ||
48 | # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in <version>/build, or the variable KERN_VER must be set. Stop. | ||
49 | mkdir -p ${WORKDIR}/${KERNEL_VERSION} | ||
50 | ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build | ||
51 | } | ||
52 | |||
41 | # compile and install mount utility | 53 | # compile and install mount utility |
42 | do_compile_append() { | 54 | do_compile_append() { |
43 | oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils | 55 | oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils |