Skip to contentSkip to conversation

vboxguestdrivers: upgrade to 5.2.6

PATCH Superseded Martin Jansa 4 participants 8 messages Feb 24, 2018 – Mar 2, 2018

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/1 vboxguestdrivers: upgrade to 5.2.6

* 5.1.26 doesn't build with 4.15 kernel

Signed-off-by Martin Jansa <[email protected]>
---
 .../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90 ++++++++++++++++++++++
 ...drivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} | 22 ++++--
 2 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} (69%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +90 -0
new file mode 100644
index 0000000000..23a9021f04
@@ -0,0 +1,90 @@
+Based on:
+https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
+
+Upstream-Status: Pending (hopefully new vbox will be released soon with proper 4.15 support, this patch isn't backwards compatible)
+
+--- vbox_module.orig/vboxvideo/vbox_mode.c	2018-02-18 16:42:47.000000000 +0000
++++ vbox_module/vboxvideo/vbox_mode.c	2018-02-18 16:55:14.466029313 +0000
+@@ -396,7 +396,7 @@
+ 
+ 	/* pick the encoder ids */
+ 	if (enc_id)
+-		return drm_encoder_find(connector->dev, enc_id);
++		return drm_encoder_find(connector->dev, NULL, enc_id);
+ 
+ 	return NULL;
+ }
+--- vbox_module.orig/vboxguest/VBoxGuest-linux.c	2018-02-18 16:42:28.000000000 +0000
++++ vbox_module/vboxguest/VBoxGuest-linux.c	2018-02-18 16:54:36.793049118 +0000
+@@ -1058,7 +1058,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+ 
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1073,7 +1073,7 @@
+ }
+ 
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1084,7 +1084,7 @@
+ 
+ 
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1098,7 +1098,7 @@
+ }
+ 
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1109,7 +1109,7 @@
+ 
+ 
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1123,7 +1123,7 @@
+ }
+ 
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1134,7 +1134,7 @@
+ 
+ 
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (    pszValue == NULL
+         || *pszValue == '\0'
+@@ -1152,7 +1152,7 @@
+ }
+ 
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+     return strlen(pszBuf);
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +17 -5
similarity index 69%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb
index fdefe03172..c018b789f2 100644
@@ -12,22 +12,27 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
 VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
-           file://Makefile.utils \
+    file://Makefile.utils \
 "
-SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3"
-SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9"
+
+# For default linux-yocto 4.15
+SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff"
+
+SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
+SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7"
 
 S = "${WORKDIR}/vbox_module"
 
 export BUILD_TARGET_ARCH="${ARCH}"
 export BUILD_TARGET_ARCH_x86-64="amd64"
-export KERN_DIR="${STAGING_KERNEL_DIR}"
+
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'"
 
 addtask export_sources before do_patch after do_unpack
 
 do_export_sources() {
     mkdir -p "${S}"
-    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz
+    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz
     tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz
 
     # add a mount utility to use shared folder from VBox Addition Source Code

@@ -38,6 +43,13 @@ do_export_sources() {
 
 }
 
+do_configure_prepend() {
+    # 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.
+    # 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.
+    mkdir -p ${WORKDIR}/${KERNEL_VERSION}
+    ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build
+}
+
 # compile and install mount utility
 do_compile_append() {
     oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
Signature · 1 line
2.15.1
#1 lore raw
Quoted 16 lines · Martin Jansa

* 5.1.26 doesn't build with 4.15 kernel

Signed-off-by Martin Jansa <[email protected]>
---
 .../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90 ++++++++++++++++++++++
 ...drivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} | 22 ++++--
 2 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} (69%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +0 -0
new file mode 100644
index 0000000000..23a9021f04

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff line 5

Quoted 5 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +5 -0
@@ -0,0 +1,90 @@
+Based on:
+https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
+
+Upstream-Status: Pending (hopefully new vbox will be released soon with proper 4.15 support, this patch isn't backwards compatible)
+

can we use something like

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)

to guard this code so it works with older kernels too

Quoted 147 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +85 -0
+--- vbox_module.orig/vboxvideo/vbox_mode.c     2018-02-18 16:42:47.000000000 +0000
++++ vbox_module/vboxvideo/vbox_mode.c  2018-02-18 16:55:14.466029313 +0000
+@@ -396,7 +396,7 @@
+
+       /* pick the encoder ids */
+       if (enc_id)
+-              return drm_encoder_find(connector->dev, enc_id);
++              return drm_encoder_find(connector->dev, NULL, enc_id);
+
+       return NULL;
+ }
+--- vbox_module.orig/vboxguest/VBoxGuest-linux.c       2018-02-18 16:42:28.000000000 +0000
++++ vbox_module/vboxguest/VBoxGuest-linux.c    2018-02-18 16:54:36.793049118 +0000
+@@ -1058,7 +1058,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1073,7 +1073,7 @@
+ }
+
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1084,7 +1084,7 @@
+
+
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1098,7 +1098,7 @@
+ }
+
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1109,7 +1109,7 @@
+
+
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1123,7 +1123,7 @@
+ }
+
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
+     *pszBuf = '\0';
+@@ -1134,7 +1134,7 @@
+
+
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+     if (    pszValue == NULL
+         || *pszValue == '\0'
+@@ -1152,7 +1152,7 @@
+ }
+
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+     strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+     return strlen(pszBuf);
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +17 -6
similarity index 69%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb
index fdefe03172..c018b789f2 100644
@@ -12,22 +12,27 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
 VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
-           file://Makefile.utils \
+    file://Makefile.utils \
 "
-SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3"
-SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9"
+
+# For default linux-yocto 4.15
+SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff"
+
+SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
+SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7"
 
 S = "${WORKDIR}/vbox_module"
 
 export BUILD_TARGET_ARCH="${ARCH}"
 export BUILD_TARGET_ARCH_x86-64="amd64"
-export KERN_DIR="${STAGING_KERNEL_DIR}"
+
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'"
 
 addtask export_sources before do_patch after do_unpack
 
 do_export_sources() {
     mkdir -p "${S}"
-    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz
+    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz
     tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz
 
     # add a mount utility to use shared folder from VBox Addition Source Code

@@ -38,6 +43,13 @@ do_export_sources() {
 
 }
 
+do_configure_prepend() {
+    # 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.
+    # 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.
+    mkdir -p ${WORKDIR}/${KERNEL_VERSION}
+    ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build
+}
+
 # compile and install mount utility
 do_compile_append() {
     oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
--

2.15.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#2 lore raw

Yes we can or we can wait for next vbox release which will hopefully include support for 4.15 as suggested in Upstream-Status.

Quoted 226 lines · Khem Raj
Quoted 5 lines · Martin Jansa

* 5.1.26 doesn't build with 4.15 kernel

Signed-off-by Martin Jansa <[email protected]>
---
 .../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90

++++++++++++++++++++++

Quoted 3 lines
 ...drivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} | 22 ++++--
 2 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/

vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

Quoted 1 line
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdri

vers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} (69%)

Review

Quoted 2 lines
(quoted diff) +0 -0

vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0- rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/

Quoted 4 lines

new file mode 100644
index 0000000000..23a9021f04

meta-oe/recipes-support/vboxguestdrivers/ new file +0 -0

vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/ line 2

Quoted 3 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
@@ -0,0 +1,90 @@
+Based on:
+https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-

4.15.0-rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/ line 4

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+
+Upstream-Status: Pending (hopefully new vbox will be released soon with

proper 4.15 support, this patch isn't backwards compatible)

meta-oe/recipes-support/vboxguestdrivers/ line 5

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
+

can we use something like

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)

to guard this code so it works with older kernels too

meta-oe/recipes-support/vboxguestdrivers/ line 6

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
+--- vbox_module.orig/vboxvideo/vbox_mode.c     2018-02-18

16:42:47.000000000 +0000

meta-oe/recipes-support/vboxguestdrivers/ line 7

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++++ vbox_module/vboxvideo/vbox_mode.c  2018-02-18 16:55:14.466029313

+0000

meta-oe/recipes-support/vboxguestdrivers/ line 17

Quoted 10 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +10 -0
+@@ -396,7 +396,7 @@
+
+       /* pick the encoder ids */
+       if (enc_id)
+-              return drm_encoder_find(connector->dev, enc_id);
++              return drm_encoder_find(connector->dev, NULL, enc_id);
+
+       return NULL;
+ }
+--- vbox_module.orig/vboxguest/VBoxGuest-linux.c       2018-02-18

16:42:28.000000000 +0000

meta-oe/recipes-support/vboxguestdrivers/ line 18

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++++ vbox_module/vboxguest/VBoxGuest-linux.c    2018-02-18

16:54:36.793049118 +0000

meta-oe/recipes-support/vboxguestdrivers/ line 23

Quoted 5 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +5 -0
+@@ -1058,7 +1058,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 24

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 32

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1073,7 +1073,7 @@
+ }
+
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param

*pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 33

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 35

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ?

RTLogDefaultInstance() : RTLogRelGetDefaultInstance();

meta-oe/recipes-support/vboxguestdrivers/ line 41

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +6 -0
+     *pszBuf = '\0';
+@@ -1084,7 +1084,7 @@
+
+
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 42

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const

struct kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 50

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1098,7 +1098,7 @@
+ }
+
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 51

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 53

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ?

RTLogDefaultInstance() : RTLogRelGetDefaultInstance();

meta-oe/recipes-support/vboxguestdrivers/ line 59

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +6 -0
+     *pszBuf = '\0';
+@@ -1109,7 +1109,7 @@
+
+
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 60

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 68

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1123,7 +1123,7 @@
+ }
+
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param

*pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 69

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 71

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ?

RTLogDefaultInstance() : RTLogRelGetDefaultInstance();

meta-oe/recipes-support/vboxguestdrivers/ line 77

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +6 -0
+     *pszBuf = '\0';
+@@ -1134,7 +1134,7 @@
+
+
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 78

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const

struct kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 86

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (    pszValue == NULL
+         || *pszValue == '\0'
+@@ -1152,7 +1152,7 @@
+ }
+
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 87

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct

kernel_param *pParam)

Review

Quoted 4 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +3 -0
+ {
+     strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+     return strlen(pszBuf);
(quoted diff) +0 -0

ers_5.1.26.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv ers_5.2.6.bb

Quoted 2 lines

similarity index 69%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv

ers_5.1.26.bb

Quoted 1 line

rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv

ers_5.2.6.bb

Quoted 2 lines

index fdefe03172..c018b789f2 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv

ers_5.1.26.bb

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" · line 14

Quoted 5 lines

+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -0
@@ -12,22 +12,27 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
 VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_

NAME}.tar.bz2 \

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 5 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +1 -3
-           file://Makefile.utils \
+    file://Makefile.utils \
 "
-SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3"
-SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d

34a00f0276b89c572eebec363dda80c8a9"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +6 -0
+
+# For default linux-yocto 4.15
+SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff"
+
+SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
+SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a

1c7091e461a7b55f98842fa1c9772ca4e7"

Quoted 4 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -0
 S = "${WORKDIR}/vbox_module"
 
 export BUILD_TARGET_ARCH="${ARCH}"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 10 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -2
 export BUILD_TARGET_ARCH_x86-64="amd64"
-export KERN_DIR="${STAGING_KERNEL_DIR}"
+
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'"
 
 addtask export_sources before do_patch after do_unpack
 
 do_export_sources() {
     mkdir -p "${S}"
-    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules

${T}/vbox_modules.tar.gz

Review COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" · line 34

Quoted 1 line
(quoted diff) +1 -0
+    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh

${T}/vbox_modules.tar.gz

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 3 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -0
     tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz
 
     # add a mount utility to use shared folder from VBox Addition

Source Code

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb do_export_sources() { · line 47

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -0
@@ -38,6 +43,13 @@ do_export_sources() {
 
 }
 
+do_configure_prepend() {
+    # 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.

Review do_export_sources() { · line 48

Quoted 1 line
(quoted diff) +1 -0
+    # 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.

Quoted 15 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +4 -1
+    mkdir -p ${WORKDIR}/${KERNEL_VERSION}
+    ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build
+}
+
 # compile and install mount utility
 do_compile_append() {
     oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
--

2.15.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#3 lore raw
Quoted 12 lines · Martin Jansa

Yes we can or we can wait for next vbox release which will hopefully include support for 4.15 as suggested in Upstream-Status.

Quoted 7 lines · Khem Raj
Quoted 5 lines · Martin Jansa

* 5.1.26 doesn't build with 4.15 kernel

Signed-off-by Martin Jansa <[email protected]>
---
 .../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90

this fails on 4.14 kernel.

vbox_module/vboxguest/VBoxGuest-linux.c:1173:35: error: passing argument 1 of '__check_old_set_param' from incompatible pointer type [-Werror=incompatible-pointer-types]
|  module_param_call(r3_log_to_host, vgdrvLinuxParamR3LogToHostSet, vgdrvLinuxParamR3LogToHostGet, NULL, 0664);
|                                    ^

Quoted 215 lines
Quoted 215 lines

++++++++++++++++++++++

Quoted 3 lines
 ...drivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} | 22 ++++--
 2 files changed, 107 insertions(+), 5 deletions(-)
 create mode 100644 meta-oe/recipes-support/vboxguestdrivers/

vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

Quoted 1 line
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdri

vers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} (69%)

Review

Quoted 1 line
(quoted diff) +0 -0

vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0- rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/

Quoted 4 lines

new file mode 100644
index 0000000000..23a9021f04

meta-oe/recipes-support/vboxguestdrivers/ new file +0 -0

vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/ line 2

Quoted 3 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
@@ -0,0 +1,90 @@
+Based on:
+https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-

4.15.0-rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/ line 4

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+
+Upstream-Status: Pending (hopefully new vbox will be released soon with

proper 4.15 support, this patch isn't backwards compatible)

meta-oe/recipes-support/vboxguestdrivers/ line 5

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
+

can we use something like

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)

to guard this code so it works with older kernels too

meta-oe/recipes-support/vboxguestdrivers/ line 6

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
+--- vbox_module.orig/vboxvideo/vbox_mode.c     2018-02-18

16:42:47.000000000 +0000

meta-oe/recipes-support/vboxguestdrivers/ line 7

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++++ vbox_module/vboxvideo/vbox_mode.c  2018-02-18 16:55:14.466029313

+0000

meta-oe/recipes-support/vboxguestdrivers/ line 17

Quoted 10 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +10 -0
+@@ -396,7 +396,7 @@
+
+       /* pick the encoder ids */
+       if (enc_id)
+-              return drm_encoder_find(connector->dev, enc_id);
++              return drm_encoder_find(connector->dev, NULL, enc_id);
+
+       return NULL;
+ }
+--- vbox_module.orig/vboxguest/VBoxGuest-linux.c       2018-02-18

16:42:28.000000000 +0000

meta-oe/recipes-support/vboxguestdrivers/ line 18

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++++ vbox_module/vboxguest/VBoxGuest-linux.c    2018-02-18

16:54:36.793049118 +0000

meta-oe/recipes-support/vboxguestdrivers/ line 23

Quoted 5 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +5 -0
+@@ -1058,7 +1058,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 24

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 32

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1073,7 +1073,7 @@
+ }
+
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param

*pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 33

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 35

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ?

RTLogDefaultInstance() : RTLogRelGetDefaultInstance();

meta-oe/recipes-support/vboxguestdrivers/ line 41

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +6 -0
+     *pszBuf = '\0';
+@@ -1084,7 +1084,7 @@
+
+
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 42

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const

struct kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 50

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1098,7 +1098,7 @@
+ }
+
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 51

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 53

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ?

RTLogDefaultInstance() : RTLogRelGetDefaultInstance();

meta-oe/recipes-support/vboxguestdrivers/ line 59

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +6 -0
+     *pszBuf = '\0';
+@@ -1109,7 +1109,7 @@
+
+
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 60

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 68

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (g_fLoggerCreated)
+     {
+@@ -1123,7 +1123,7 @@
+ }
+
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param

*pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 69

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 71

Quoted 2 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +2 -0
+ {
+     PRTLOGGER pLogger = pParam->name[0] == 'd' ?

RTLogDefaultInstance() : RTLogRelGetDefaultInstance();

meta-oe/recipes-support/vboxguestdrivers/ line 77

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +6 -0
+     *pszBuf = '\0';
+@@ -1134,7 +1134,7 @@
+
+
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 78

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const

struct kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 86

Quoted 8 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +8 -0
+ {
+     if (    pszValue == NULL
+         || *pszValue == '\0'
+@@ -1152,7 +1152,7 @@
+ }
+
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct

kernel_param *pParam)

meta-oe/recipes-support/vboxguestdrivers/ line 87

Quoted 1 line
meta-oe/recipes-support/vboxguestdrivers/ new file +1 -0
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct

kernel_param *pParam)

Review

Quoted 4 lines
meta-oe/recipes-support/vboxguestdrivers/ new file +3 -0
+ {
+     strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+     return strlen(pszBuf);
(quoted diff) +0 -0

ers_5.1.26.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv ers_5.2.6.bb

Quoted 2 lines

similarity index 69%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv

ers_5.1.26.bb

Quoted 1 line

rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv

ers_5.2.6.bb

Quoted 2 lines

index fdefe03172..c018b789f2 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdriv

ers_5.1.26.bb

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" · line 14

Quoted 5 lines

+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -0
@@ -12,22 +12,27 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
 VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_

NAME}.tar.bz2 \

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 5 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +1 -3
-           file://Makefile.utils \
+    file://Makefile.utils \
 "
-SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3"
-SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d

34a00f0276b89c572eebec363dda80c8a9"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +6 -0
+
+# For default linux-yocto 4.15
+SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff"
+
+SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
+SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a

1c7091e461a7b55f98842fa1c9772ca4e7"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 13 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -2
 S = "${WORKDIR}/vbox_module"
 
 export BUILD_TARGET_ARCH="${ARCH}"
 export BUILD_TARGET_ARCH_x86-64="amd64"
-export KERN_DIR="${STAGING_KERNEL_DIR}"
+
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'"
 
 addtask export_sources before do_patch after do_unpack
 
 do_export_sources() {
     mkdir -p "${S}"
-    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules

${T}/vbox_modules.tar.gz

Review COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" · line 34

Quoted 1 line
(quoted diff) +1 -0
+    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh

${T}/vbox_modules.tar.gz

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

Quoted 3 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -0
     tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz
 
     # add a mount utility to use shared folder from VBox Addition

Source Code

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb do_export_sources() { · line 47

Quoted 6 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -0
@@ -38,6 +43,13 @@ do_export_sources() {
 
 }
 
+do_configure_prepend() {
+    # 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.

Review do_export_sources() { · line 48

Quoted 1 line
(quoted diff) +1 -0
+    # 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.

Quoted 15 lines
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +4 -1
+    mkdir -p ${WORKDIR}/${KERNEL_VERSION}
+    ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build
+}
+
 # compile and install mount utility
 do_compile_append() {
     oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
--

2.15.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#4 lore raw
In reply to Martin Jansa

2018-02-24 11:51 időpontban Martin Jansa ezt írta:

Quoted 1 line

* 5.1.26 doesn't build with 4.15 kernel

But 5.1.32 does IIRC.

Anyway, kernel 4.15 includes the vboxguest and vboxvideo drivers which has the advantage that these drivers are signed properly (in case you have set it in the kernel config) unlike the drivers coming from vboxguestdrivers.

Quoted 191 lines
Signed-off-by Martin Jansa <[email protected]>

---
.../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90
++++++++++++++++++++++
...drivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} | 22 ++++--

2 files changed, 107 insertions(+), 5 deletions(-)

create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} (69%)

(quoted diff) +0 -0
new file mode 100644
index 0000000000..23a9021f04

b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +2 -0
@@ -0,0 +1,90 @@
+Based on:
+https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

[1]

(quoted diff) +2 -0
+
+Upstream-Status: Pending (hopefully new vbox will be released soon

with proper 4.15 support, this patch isn't backwards compatible) +
+--- vbox_module.orig/vboxvideo/vbox_mode.c 2018-02-18 16:42:47.000000000 +0000
++++ vbox_module/vboxvideo/vbox_mode.c 2018-02-18 16:55:14.466029313 +0000
+@@ -396,7 +396,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +9 -0
+
+ /* pick the encoder ids */
+ if (enc_id)
+- return drm_encoder_find(connector->dev, enc_id);
++ return drm_encoder_find(connector->dev, NULL, enc_id);
+
+ return NULL;
+ }
+--- vbox_module.orig/vboxguest/VBoxGuest-linux.c 2018-02-18

16:42:28.000000000 +0000
++++ vbox_module/vboxguest/VBoxGuest-linux.c 2018-02-18 16:54:36.793049118 +0000
+@@ -1058,7 +1058,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1073,7 +1073,7 @@
+ }
+
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() :
RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1084,7 +1084,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +4 -0
+
+
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct

kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1098,7 +1098,7 @@
+ }
+
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() :
RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1109,7 +1109,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +4 -0
+
+
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct

kernel_param *pParam)
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1123,7 +1123,7 @@
+ }
+
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() :
RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1134,7 +1134,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +4 -0
+
+
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct

kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if ( pszValue == NULL
+ || *pszValue == '\0'
+@@ -1152,7 +1152,7 @@
+ }
+
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+ return strlen(pszBuf);

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -1
similarity index 69%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb
index fdefe03172..c018b789f2 100644
---

a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb
+++
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -0
@@ -12,22 +12,27 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

VBOX_NAME = "VirtualBox-${PV}"

SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 [2] \
- file://Makefile.utils [3] \
+ file://Makefile.utils [3] \
"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +0 -2
-SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3"
-SRC_URI[sha256sum] =

"b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +6 -0
+
+# For default linux-yocto 4.15
+SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff [4]"
+
+SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
+SRC_URI[sha256sum] =

"fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7"

S = "${WORKDIR}/vbox_module"

export BUILD_TARGET_ARCH="${ARCH}"
export BUILD_TARGET_ARCH_x86-64="amd64"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -1
-export KERN_DIR="${STAGING_KERNEL_DIR}"
+
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'"

addtask export_sources before do_patch after do_unpack

do_export_sources() {
mkdir -p "${S}"
- ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz
+ ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz
tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz

# add a mount utility to use shared folder from VBox Addition Source Code
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -0
@@ -38,6 +43,13 @@ do_export_sources() {
 
 }
 
+do_configure_prepend() {
+ #

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.
+ #
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.
+ mkdir -p ${WORKDIR}/${KERNEL_VERSION}
+ ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -0
+}
+
Quoted 5 lines
# compile and install mount utility
do_compile_append() {
oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
--
2.15.1

Links:
------
[1] https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
[2] http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
[3] file://Makefile.utils
[4] file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

author
#5 lore raw
Quoted 5 lines · On Mon, Feb 26, 2018 at 06:37:21AM +0100, [email protected] wrote:

2018-02-24 11:51 időpontban Martin Jansa ezt írta:

Quoted 1 line

* 5.1.26 doesn't build with 4.15 kernel

But 5.1.32 does IIRC.

According to the changelog only 5.1.34 does:
https://www.virtualbox.org/wiki/Changelog-5.1
VirtualBox 5.1.34 (released 2018-02-27)

I've sent v2 which updated to 5.2.8 which includes 4.15 support as well:
https://www.virtualbox.org/wiki/Changelog
VirtualBox 5.2.8 (released 2018-02-27)

Linux guests: Linux 4.15 support (bugs #17311, #17320, #17282)

Quoted 4 lines

Anyway, kernel 4.15 includes the vboxguest and vboxvideo drivers which has the advantage that these drivers are signed properly (in case you have set it in the kernel config) unlike the drivers coming from vboxguestdrivers.

I think that 4.15 contains only vboxvideo, not vboxguest and vboxsf provided by vboxguestdrivers. 4.16 contains vboxguest (I don't know about vboxsf support in vanilla).

Regards,

Quoted 222 lines
Quoted 207 lines
Signed-off-by Martin Jansa <[email protected]>

---
.../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90
++++++++++++++++++++++
...drivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} | 22 ++++--

2 files changed, 107 insertions(+), 5 deletions(-)

create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff rename
meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.1.26.bb => vboxguestdrivers_5.2.6.bb} (69%)

(quoted diff) +0 -0

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 0000000000..23a9021f04
--- /dev/null
+++
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +2 -0
@@ -0,0 +1,90 @@
+Based on:
+https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

[1]

(quoted diff) +2 -0
+
+Upstream-Status: Pending (hopefully new vbox will be released soon

with proper 4.15 support, this patch isn't backwards compatible) +
+--- vbox_module.orig/vboxvideo/vbox_mode.c 2018-02-18 16:42:47.000000000 +0000
++++ vbox_module/vboxvideo/vbox_mode.c 2018-02-18 16:55:14.466029313 +0000
+@@ -396,7 +396,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +9 -0
+
+ /* pick the encoder ids */
+ if (enc_id)
+- return drm_encoder_find(connector->dev, enc_id);
++ return drm_encoder_find(connector->dev, NULL, enc_id);
+
+ return NULL;
+ }
+--- vbox_module.orig/vboxguest/VBoxGuest-linux.c 2018-02-18

16:42:28.000000000 +0000
++++ vbox_module/vboxguest/VBoxGuest-linux.c 2018-02-18 16:54:36.793049118 +0000
+@@ -1058,7 +1058,7 @@
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+
+ /** log and dbg_log parameter setter. */
+-static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1073,7 +1073,7 @@
+ }
+
+ /** log and dbg_log parameter getter. */
+-static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() :
RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1084,7 +1084,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +4 -0
+
+
+ /** log and dbg_log_flags parameter setter. */
+-static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct

kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1098,7 +1098,7 @@
+ }
+
+ /** log and dbg_log_flags parameter getter. */
+-static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() :
RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1109,7 +1109,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +4 -0
+
+
+ /** log and dbg_log_dest parameter setter. */
+-static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct

kernel_param *pParam)
++static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if (g_fLoggerCreated)
+ {
+@@ -1123,7 +1123,7 @@
+ }
+
+ /** log and dbg_log_dest parameter getter. */
+-static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() :
RTLogRelGetDefaultInstance();
+ *pszBuf = '\0';
+@@ -1134,7 +1134,7 @@

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff new file +4 -0
+
+
+ /** r3_log_to_host parameter setter. */
+-static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct

kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
+ {
+ if ( pszValue == NULL
+ || *pszValue == '\0'
+@@ -1152,7 +1152,7 @@
+ }
+
+ /** r3_log_to_host parameter getter. */
+-static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
++static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
+ {
+ strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
+ return strlen(pszBuf);

(quoted diff) +0 -0

a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb similarity index 69%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb index fdefe03172..c018b789f2 100644
---
a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb
+++
b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb

(quoted diff) +0 -0
@@ -12,22 +12,27 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"

VBOX_NAME = "VirtualBox-${PV}"

SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
[2] \
- file://Makefile.utils [3] \
+ file://Makefile.utils [3] \
"

(quoted diff) +0 -2
-SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3"
-SRC_URI[sha256sum] =

"b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +6 -0
+
+# For default linux-yocto 4.15
+SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff [4]"
+
+SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
+SRC_URI[sha256sum] =

"fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7"

S = "${WORKDIR}/vbox_module"

export BUILD_TARGET_ARCH="${ARCH}"
export BUILD_TARGET_ARCH_x86-64="amd64"

meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -1
-export KERN_DIR="${STAGING_KERNEL_DIR}"
+
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'"

addtask export_sources before do_patch after do_unpack

do_export_sources() {
mkdir -p "${S}"
- ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz
+ ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz
tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz

# add a mount utility to use shared folder from VBox Addition Source 
Code
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +2 -0
@@ -38,6 +43,13 @@ do_export_sources() {
 
 }
 
+do_configure_prepend() {
+ #

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.
+ # 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.
+ mkdir -p ${WORKDIR}/${KERNEL_VERSION}
+ ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build

(quoted diff) +2 -0
+}
+
Quoted 5 lines
# compile and install mount utility
do_compile_append() {
oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
--
2.15.1

Links:
------
[1]
https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
[2] http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
[3] file://Makefile.utils
[4] file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#6 lore raw

PATCH v2 1/1 vboxguestdrivers: upgrade to 5.2.8

In reply to Martin Jansa

* 5.1.26 doesn't build with 4.15 kernel

Signed-off-by Martin Jansa <[email protected]>
---
 ...estdrivers_5.1.26.bb => vboxguestdrivers_5.2.8.bb} | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.1.26.bb => vboxguestdrivers_5.2.8.bb} (71%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb +14 -5
similarity index 71%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.1.26.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
index fdefe03172..e00db4d7e0 100644
@@ -12,22 +12,24 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
 VBOX_NAME = "VirtualBox-${PV}"
 
 SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
-           file://Makefile.utils \
+    file://Makefile.utils \
 "
-SRC_URI[md5sum] = "d3aec8190c649d7e0d92ba374779dfe3"
-SRC_URI[sha256sum] = "b5715035e681a11ef1475f83f9503d34a00f0276b89c572eebec363dda80c8a9"
+
+SRC_URI[md5sum] = "e731ea9c5c31096ec4c2a3bfba26665c"
+SRC_URI[sha256sum] = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"
 
 S = "${WORKDIR}/vbox_module"
 
 export BUILD_TARGET_ARCH="${ARCH}"
 export BUILD_TARGET_ARCH_x86-64="amd64"
-export KERN_DIR="${STAGING_KERNEL_DIR}"
+
+EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build'"
 
 addtask export_sources before do_patch after do_unpack
 
 do_export_sources() {
     mkdir -p "${S}"
-    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules ${T}/vbox_modules.tar.gz
+    ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz
     tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz
 
     # add a mount utility to use shared folder from VBox Addition Source Code

@@ -38,6 +40,13 @@ do_export_sources() {
 
 }
 
+do_configure_prepend() {
+    # 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.
+    # 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.
+    mkdir -p ${WORKDIR}/${KERNEL_VERSION}
+    ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build
+}
+
 # compile and install mount utility
 do_compile_append() {
     oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils
Signature · 1 line
2.15.1
author
#7 lore raw

PATCH v3 1/1 vboxguestdrivers: upgrade to 5.2.8

In reply to Martin Jansa

* 5.1.26 doesn't build with 4.15 kernel

Signed-off-by Martin Jansa <[email protected]>
---
 .../linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff | 90 ----------------------
 ...tdrivers_5.2.6.bb => vboxguestdrivers_5.2.8.bb} |  7 +-
 2 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
 rename meta-oe/recipes-support/vboxguestdrivers/{vboxguestdrivers_5.2.6.bb => vboxguestdrivers_5.2.8.bb} (91%)
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff deleted +0 -90
deleted file mode 100644
index 23a9021f04..0000000000
@@ -1,90 +0,0 @@
-Based on:
-https://raw.githubusercontent.com/mjmaravillo/misc/master/linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff
-
-Upstream-Status: Pending (hopefully new vbox will be released soon with proper 4.15 support, this patch isn't backwards compatible)
-
---- vbox_module.orig/vboxvideo/vbox_mode.c	2018-02-18 16:42:47.000000000 +0000
-+++ vbox_module/vboxvideo/vbox_mode.c	2018-02-18 16:55:14.466029313 +0000
-@@ -396,7 +396,7 @@
- 
- 	/* pick the encoder ids */
- 	if (enc_id)
--		return drm_encoder_find(connector->dev, enc_id);
-+		return drm_encoder_find(connector->dev, NULL, enc_id);
- 
- 	return NULL;
- }
---- vbox_module.orig/vboxguest/VBoxGuest-linux.c	2018-02-18 16:42:28.000000000 +0000
-+++ vbox_module/vboxguest/VBoxGuest-linux.c	2018-02-18 16:54:36.793049118 +0000
-@@ -1058,7 +1058,7 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
- 
- /** log and dbg_log parameter setter. */
--static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
- {
-     if (g_fLoggerCreated)
-     {
-@@ -1073,7 +1073,7 @@
- }
- 
- /** log and dbg_log parameter getter. */
--static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
- {
-     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
-     *pszBuf = '\0';
-@@ -1084,7 +1084,7 @@
- 
- 
- /** log and dbg_log_flags parameter setter. */
--static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
- {
-     if (g_fLoggerCreated)
-     {
-@@ -1098,7 +1098,7 @@
- }
- 
- /** log and dbg_log_flags parameter getter. */
--static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
- {
-     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
-     *pszBuf = '\0';
-@@ -1109,7 +1109,7 @@
- 
- 
- /** log and dbg_log_dest parameter setter. */
--static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
- {
-     if (g_fLoggerCreated)
-     {
-@@ -1123,7 +1123,7 @@
- }
- 
- /** log and dbg_log_dest parameter getter. */
--static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
- {
-     PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
-     *pszBuf = '\0';
-@@ -1134,7 +1134,7 @@
- 
- 
- /** r3_log_to_host parameter setter. */
--static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
-+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
- {
-     if (    pszValue == NULL
-         || *pszValue == '\0'
-@@ -1152,7 +1152,7 @@
- }
- 
- /** r3_log_to_host parameter getter. */
--static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
-+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
- {
-     strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
-     return strlen(pszBuf);
meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb +2 -5
similarity index 91%
rename from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.6.bb
rename to meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_5.2.8.bb
index c018b789f2..e00db4d7e0 100644
@@ -15,11 +15,8 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2
     file://Makefile.utils \
 "
 
-# For default linux-yocto 4.15
-SRC_URI += "file://linux-4.15.0-rc8-VBoxGuestAdditions-amd64.diff"
-
-SRC_URI[md5sum] = "4490d6929dfae41cdf05e34f583318c8"
-SRC_URI[sha256sum] = "fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7"
+SRC_URI[md5sum] = "e731ea9c5c31096ec4c2a3bfba26665c"
+SRC_URI[sha256sum] = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8"
 
 S = "${WORKDIR}/vbox_module"
Signature · 1 line
2.15.1